Skip to content

Commit c07f819

Browse files
Bump mongoid
1 parent a06da97 commit c07f819

File tree

2 files changed

+38
-49
lines changed

2 files changed

+38
-49
lines changed

Gemfile.lock

Lines changed: 36 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PATH
1111
activeadmin (>= 1.4.3)
1212
jquery-rails
1313
kaminari-mongoid
14-
mongoid (~> 6.0)
14+
mongoid (>= 6.0, <= 7.0)
1515
sass-rails (>= 3.1.4)
1616

1717
GEM
@@ -40,18 +40,17 @@ GEM
4040
erubi (~> 1.4)
4141
rails-dom-testing (~> 2.0)
4242
rails-html-sanitizer (~> 1.0, >= 1.0.3)
43-
activeadmin (1.4.3)
44-
arbre (>= 1.1.1)
45-
coffee-rails
43+
activeadmin (2.6.0)
44+
arbre (~> 1.2, >= 1.2.1)
4645
formtastic (~> 3.1)
47-
formtastic_i18n
48-
inherited_resources (>= 1.9.0)
49-
jquery-rails (>= 4.2.0)
50-
kaminari (>= 0.15)
51-
railties (>= 4.2, < 5.3)
52-
ransack (>= 1.8.7)
53-
sass (~> 3.1)
54-
sprockets (< 4.1)
46+
formtastic_i18n (~> 0.4)
47+
inherited_resources (~> 1.7)
48+
jquery-rails (~> 4.2)
49+
kaminari (~> 1.0, >= 1.0.1)
50+
railties (>= 5.2, < 6.1)
51+
ransack (~> 2.1, >= 2.1.1)
52+
sassc-rails (~> 2.1)
53+
sprockets (>= 3.0, < 4.1)
5554
activejob (5.2.3)
5655
activesupport (= 5.2.3)
5756
globalid (>= 0.3.6)
@@ -76,7 +75,7 @@ GEM
7675
activesupport (>= 3.0.0)
7776
arel (9.0.0)
7877
bcrypt (3.1.13)
79-
bson (4.4.2)
78+
bson (4.7.1)
8079
builder (3.2.3)
8180
capybara (3.12.0)
8281
addressable
@@ -88,13 +87,6 @@ GEM
8887
xpath (~> 3.2)
8988
cliver (0.3.2)
9089
coderay (1.1.2)
91-
coffee-rails (4.2.2)
92-
coffee-script (>= 2.2.0)
93-
railties (>= 4.0.0)
94-
coffee-script (2.4.1)
95-
coffee-script-source
96-
execjs
97-
coffee-script-source (1.12.2)
9890
concurrent-ruby (1.1.5)
9991
crass (1.0.5)
10092
devise (4.7.1)
@@ -106,8 +98,7 @@ GEM
10698
diff-lcs (1.3)
10799
docile (1.3.1)
108100
erubi (1.8.0)
109-
execjs (2.7.0)
110-
ffi (1.10.0)
101+
ffi (1.12.1)
111102
formtastic (3.1.5)
112103
actionpack (>= 3.2.13)
113104
formtastic_i18n (0.6.0)
@@ -118,11 +109,11 @@ GEM
118109
activesupport (>= 4.1)
119110
i18n (1.6.0)
120111
concurrent-ruby (~> 1.0)
121-
inherited_resources (1.10.0)
122-
actionpack (>= 5.0, < 6.0)
112+
inherited_resources (1.11.0)
113+
actionpack (>= 5.0, < 6.1)
123114
has_scope (~> 0.6)
124-
railties (>= 5.0, < 6.0)
125-
responders (~> 2.0)
115+
railties (>= 5.0, < 6.1)
116+
responders (>= 2, < 4)
126117
jquery-rails (4.3.3)
127118
rails-dom-testing (>= 1, < 3)
128119
railties (>= 4.2.0)
@@ -161,9 +152,9 @@ GEM
161152
mini_mime (1.0.1)
162153
mini_portile2 (2.4.0)
163154
minitest (5.11.3)
164-
mongo (2.8.0)
155+
mongo (2.11.3)
165156
bson (>= 4.4.2, < 5.0.0)
166-
mongoid (6.4.2)
157+
mongoid (7.0.0)
167158
activemodel (>= 5.1, < 6.0.0)
168159
mongo (>= 2.5.1, < 3.0.0)
169160
nio4r (2.3.1)
@@ -174,6 +165,8 @@ GEM
174165
capybara (>= 2.1, < 4)
175166
cliver (~> 0.3.1)
176167
websocket-driver (>= 0.2.0)
168+
polyamorous (2.3.2)
169+
activerecord (>= 5.2.1)
177170
pry (0.12.2)
178171
coderay (~> 1.1.0)
179172
method_source (~> 0.9.0)
@@ -208,14 +201,11 @@ GEM
208201
rake (>= 0.8.7)
209202
thor (>= 0.19.0, < 2.0)
210203
rake (12.3.3)
211-
ransack (2.1.1)
212-
actionpack (>= 5.0)
213-
activerecord (>= 5.0)
214-
activesupport (>= 5.0)
204+
ransack (2.3.2)
205+
activerecord (>= 5.2.1)
206+
activesupport (>= 5.2.1)
215207
i18n
216-
rb-fsevent (0.10.3)
217-
rb-inotify (0.10.0)
218-
ffi (~> 1.0)
208+
polyamorous (= 2.3.2)
219209
regexp_parser (1.3.0)
220210
responders (2.4.1)
221211
actionpack (>= 4.2.0, < 6.0)
@@ -237,17 +227,16 @@ GEM
237227
rspec-mocks (~> 3.8.0)
238228
rspec-support (~> 3.8.0)
239229
rspec-support (3.8.0)
240-
sass (3.7.4)
241-
sass-listen (~> 4.0.0)
242-
sass-listen (4.0.0)
243-
rb-fsevent (~> 0.9, >= 0.9.4)
244-
rb-inotify (~> 0.9, >= 0.9.7)
245-
sass-rails (5.0.7)
246-
railties (>= 4.0.0, < 6)
247-
sass (~> 3.1)
248-
sprockets (>= 2.8, < 4.0)
249-
sprockets-rails (>= 2.0, < 4.0)
250-
tilt (>= 1.1, < 3)
230+
sass-rails (6.0.0)
231+
sassc-rails (~> 2.1, >= 2.1.1)
232+
sassc (2.2.1)
233+
ffi (~> 1.9)
234+
sassc-rails (2.1.2)
235+
railties (>= 4.0.0)
236+
sassc (>= 2.0)
237+
sprockets (> 3.0)
238+
sprockets-rails
239+
tilt
251240
simplecov (0.16.1)
252241
docile (~> 1.1)
253242
json (>= 1.8, < 3)
@@ -262,7 +251,7 @@ GEM
262251
sprockets (>= 3.0.0)
263252
thor (0.20.3)
264253
thread_safe (0.3.6)
265-
tilt (2.0.9)
254+
tilt (2.0.10)
266255
tzinfo (1.2.5)
267256
thread_safe (~> 0.1)
268257
warden (1.2.8)

activeadmin-mongoid.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
1717
gem.require_paths = ['lib']
1818
gem.version = ActiveAdmin::Mongoid::VERSION
1919
gem.license = 'MIT'
20-
20+
2121
gem.required_ruby_version = '>= 2.3'
2222

23-
gem.add_runtime_dependency 'mongoid', ['~> 6.0']
23+
gem.add_runtime_dependency 'mongoid', '>= 6.0', '<= 7.0'
2424
gem.add_runtime_dependency 'activeadmin', '>= 1.4.3'
2525
gem.add_runtime_dependency 'kaminari-mongoid'
2626
gem.add_runtime_dependency 'jquery-rails'

0 commit comments

Comments
 (0)