Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin mongoid #1401

Open
wants to merge 2 commits into
base: mainline
Choose a base branch
from
Open

Unpin mongoid #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2145bc
Unpin mongoid
CloCkWeRX Apr 29, 2023
0c67c95
Merge branch 'mainline' into mongoid
Br3nda Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ source 'https://rubygems.org'
gem 'bundler'
gem 'rails'

# We can't upgrade to Mongoid 7 unless someone has
# time to manually QA the failed view specs that
# it causes. -RC 15 MAR 19
gem 'mongoid', '~> 6'
gem 'mongoid'

gem 'delayed_job_mongoid' # <= Problematic dep upgrade
gem 'delayed_job_shallow_mongoid'
Expand Down
24 changes: 13 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ GEM
bcrypt (3.1.16)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bson (4.11.1)
bson (4.15.0)
bson_ext (1.5.1)
builder (3.2.4)
capybara (3.33.0)
Expand Down Expand Up @@ -160,7 +160,7 @@ GEM
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
Expand Down Expand Up @@ -250,7 +250,7 @@ GEM
multi_json (>= 1.9.2)
high_voltage (3.1.2)
highline (2.0.3)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
jmespath (1.6.1)
jquery-rails (4.4.0)
Expand Down Expand Up @@ -300,13 +300,14 @@ GEM
rake
mini_mime (1.0.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
minitest (5.18.0)
moneta (1.0.0)
mongo (2.14.0)
bson (>= 4.8.2, < 5.0.0)
mongoid (6.4.8)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
mongo (2.18.2)
bson (>= 4.14.1, < 5.0.0)
mongoid (7.5.2)
activemodel (>= 5.1, < 7.1, != 7.0.0)
mongo (>= 2.10.5, < 3.0.0)
ruby2_keywords (~> 0.0.5)
mongoid-compatibility (0.5.1)
activesupport
mongoid (>= 2.0)
Expand Down Expand Up @@ -463,6 +464,7 @@ GEM
rubocop-ast (1.4.0)
parser (>= 2.7.1.5)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyzip (2.0.0)
sass (3.4.25)
sass-rails (5.0.7)
Expand Down Expand Up @@ -530,7 +532,7 @@ GEM
typhoeus (~> 0.6, >= 0.6.8)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.10)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -584,7 +586,7 @@ DEPENDENCIES
launchy
letter_opener
merit
mongoid (~> 6)
mongoid
mongoid-history
mongoid-paperclip
mongoid-slug
Expand Down