Skip to content

Commit 202c2da

Browse files
authored
Merge pull request #365 from better-together-org/dependabot/bundler/rails-6.1.7
Update rails requirement from >= 5.2.2, < 6.1.0 to >= 5.2.2, < 7.1.0
2 parents e0c353c + dee6c26 commit 202c2da

File tree

2 files changed

+104
-87
lines changed

2 files changed

+104
-87
lines changed

Gemfile.lock

Lines changed: 103 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -21,73 +21,77 @@ PATH
2121
pundit (~> 2.1.0)
2222
pundit-resources
2323
rack-cors (~> 1.1.1)
24-
rails (>= 5.2.2, < 6.1.0)
24+
rails (>= 5.2.2, < 7.1.0)
2525
rswag (~> 2.3.1)
2626

2727
GEM
2828
remote: https://rubygems.org/
2929
specs:
30-
actioncable (6.0.4.4)
31-
actionpack (= 6.0.4.4)
30+
actioncable (6.1.7)
31+
actionpack (= 6.1.7)
32+
activesupport (= 6.1.7)
3233
nio4r (~> 2.0)
3334
websocket-driver (>= 0.6.1)
34-
actionmailbox (6.0.4.4)
35-
actionpack (= 6.0.4.4)
36-
activejob (= 6.0.4.4)
37-
activerecord (= 6.0.4.4)
38-
activestorage (= 6.0.4.4)
39-
activesupport (= 6.0.4.4)
35+
actionmailbox (6.1.7)
36+
actionpack (= 6.1.7)
37+
activejob (= 6.1.7)
38+
activerecord (= 6.1.7)
39+
activestorage (= 6.1.7)
40+
activesupport (= 6.1.7)
4041
mail (>= 2.7.1)
41-
actionmailer (6.0.4.4)
42-
actionpack (= 6.0.4.4)
43-
actionview (= 6.0.4.4)
44-
activejob (= 6.0.4.4)
42+
actionmailer (6.1.7)
43+
actionpack (= 6.1.7)
44+
actionview (= 6.1.7)
45+
activejob (= 6.1.7)
46+
activesupport (= 6.1.7)
4547
mail (~> 2.5, >= 2.5.4)
4648
rails-dom-testing (~> 2.0)
47-
actionpack (6.0.4.4)
48-
actionview (= 6.0.4.4)
49-
activesupport (= 6.0.4.4)
50-
rack (~> 2.0, >= 2.0.8)
49+
actionpack (6.1.7)
50+
actionview (= 6.1.7)
51+
activesupport (= 6.1.7)
52+
rack (~> 2.0, >= 2.0.9)
5153
rack-test (>= 0.6.3)
5254
rails-dom-testing (~> 2.0)
5355
rails-html-sanitizer (~> 1.0, >= 1.2.0)
54-
actiontext (6.0.4.4)
55-
actionpack (= 6.0.4.4)
56-
activerecord (= 6.0.4.4)
57-
activestorage (= 6.0.4.4)
58-
activesupport (= 6.0.4.4)
56+
actiontext (6.1.7)
57+
actionpack (= 6.1.7)
58+
activerecord (= 6.1.7)
59+
activestorage (= 6.1.7)
60+
activesupport (= 6.1.7)
5961
nokogiri (>= 1.8.5)
60-
actionview (6.0.4.4)
61-
activesupport (= 6.0.4.4)
62+
actionview (6.1.7)
63+
activesupport (= 6.1.7)
6264
builder (~> 3.1)
6365
erubi (~> 1.4)
6466
rails-dom-testing (~> 2.0)
6567
rails-html-sanitizer (~> 1.1, >= 1.2.0)
66-
activejob (6.0.4.4)
67-
activesupport (= 6.0.4.4)
68+
activejob (6.1.7)
69+
activesupport (= 6.1.7)
6870
globalid (>= 0.3.6)
69-
activemodel (6.0.4.4)
70-
activesupport (= 6.0.4.4)
71-
activerecord (6.0.4.4)
72-
activemodel (= 6.0.4.4)
73-
activesupport (= 6.0.4.4)
74-
activestorage (6.0.4.4)
75-
actionpack (= 6.0.4.4)
76-
activejob (= 6.0.4.4)
77-
activerecord (= 6.0.4.4)
78-
marcel (~> 1.0.0)
79-
activesupport (6.0.4.4)
71+
activemodel (6.1.7)
72+
activesupport (= 6.1.7)
73+
activerecord (6.1.7)
74+
activemodel (= 6.1.7)
75+
activesupport (= 6.1.7)
76+
activestorage (6.1.7)
77+
actionpack (= 6.1.7)
78+
activejob (= 6.1.7)
79+
activerecord (= 6.1.7)
80+
activesupport (= 6.1.7)
81+
marcel (~> 1.0)
82+
mini_mime (>= 1.1.0)
83+
activesupport (6.1.7)
8084
concurrent-ruby (~> 1.0, >= 1.0.2)
81-
i18n (>= 0.7, < 2)
82-
minitest (~> 5.1)
83-
tzinfo (~> 1.1)
84-
zeitwerk (~> 2.2, >= 2.2.2)
85+
i18n (>= 1.6, < 2)
86+
minitest (>= 5.1)
87+
tzinfo (~> 2.0)
88+
zeitwerk (~> 2.3)
8589
addressable (2.8.0)
8690
public_suffix (>= 2.0.2, < 5.0)
8791
archive-zip (0.12.0)
8892
io-like (~> 0.3.0)
8993
ast (2.4.2)
90-
bcrypt (3.1.16)
94+
bcrypt (3.1.18)
9195
better_errors (2.9.1)
9296
coderay (>= 1.0.0)
9397
erubi (>= 1.0.0)
@@ -110,39 +114,40 @@ GEM
110114
archive-zip (~> 0.10)
111115
nokogiri (~> 1.8)
112116
coderay (1.1.3)
113-
concurrent-ruby (1.1.9)
117+
concurrent-ruby (1.1.10)
114118
coveralls (0.7.1)
115119
multi_json (~> 1.3)
116120
rest-client
117121
simplecov (>= 0.7)
118122
term-ansicolor
119123
thor
120124
crass (1.0.6)
125+
date (3.3.3)
121126
debug_inspector (1.0.0)
122127
devise (4.8.1)
123128
bcrypt (~> 3.0)
124129
orm_adapter (~> 0.1)
125130
railties (>= 4.1.0)
126131
responders
127132
warden (~> 1.2.3)
128-
devise-jwt (0.9.0)
133+
devise-jwt (0.10.0)
129134
devise (~> 4.0)
130135
warden-jwt_auth (~> 0.6)
131136
diff-lcs (1.4.4)
132137
docile (1.3.4)
133138
domain_name (0.5.20190701)
134139
unf (>= 0.0.5, < 1.0.0)
135-
dry-auto_inject (0.8.0)
140+
dry-auto_inject (0.9.0)
136141
dry-container (>= 0.3.4)
137-
dry-configurable (0.13.0)
138-
concurrent-ruby (~> 1.0)
142+
dry-configurable (0.16.1)
139143
dry-core (~> 0.6)
140-
dry-container (0.9.0)
144+
zeitwerk (~> 2.6)
145+
dry-container (0.11.0)
141146
concurrent-ruby (~> 1.0)
142-
dry-configurable (~> 0.13, >= 0.13.0)
143-
dry-core (0.7.1)
147+
dry-core (0.9.1)
144148
concurrent-ruby (~> 1.0)
145-
erubi (1.10.0)
149+
zeitwerk (~> 2.6)
150+
erubi (1.11.0)
146151
execjs (2.7.0)
147152
factory_bot (6.1.0)
148153
activesupport (>= 5.0.0)
@@ -165,7 +170,7 @@ GEM
165170
http-accept (1.7.0)
166171
http-cookie (1.0.3)
167172
domain_name (~> 0.5)
168-
i18n (1.8.11)
173+
i18n (1.12.0)
169174
concurrent-ruby (~> 1.0)
170175
io-like (0.3.1)
171176
json (2.6.3)
@@ -175,28 +180,40 @@ GEM
175180
activerecord (>= 4.1)
176181
concurrent-ruby
177182
railties (>= 4.1)
178-
jwt (2.3.0)
183+
jwt (2.5.0)
179184
listen (3.4.1)
180185
rb-fsevent (~> 0.10, >= 0.10.3)
181186
rb-inotify (~> 0.9, >= 0.9.10)
182187
loofah (2.19.1)
183188
crass (~> 1.0.2)
184189
nokogiri (>= 1.5.9)
185-
mail (2.7.1)
190+
mail (2.8.0)
186191
mini_mime (>= 0.1.1)
192+
net-imap
193+
net-pop
194+
net-smtp
187195
marcel (1.0.2)
188196
method_source (1.0.0)
189197
mime-types (3.3.1)
190198
mime-types-data (~> 3.2015)
191199
mime-types-data (3.2020.1104)
192200
mini_mime (1.1.2)
193201
mini_portile2 (2.8.0)
194-
minitest (5.15.0)
202+
minitest (5.16.3)
195203
mobility (0.8.13)
196204
i18n (>= 0.6.10, < 2)
197205
request_store (~> 1.0)
198206
msgpack (1.3.3)
199207
multi_json (1.15.0)
208+
net-imap (0.3.3)
209+
date
210+
net-protocol
211+
net-pop (0.1.2)
212+
net-protocol
213+
net-protocol (0.2.1)
214+
timeout
215+
net-smtp (0.3.3)
216+
net-protocol
200217
netrc (0.11.0)
201218
nio4r (2.5.8)
202219
nokogiri (1.13.10)
@@ -217,39 +234,39 @@ GEM
217234
pundit (2.1.1)
218235
activesupport (>= 3.0.0)
219236
racc (1.6.1)
220-
rack (2.2.3)
237+
rack (2.2.4)
221238
rack-cors (1.1.1)
222239
rack (>= 2.0.0)
223240
rack-mini-profiler (2.3.2)
224241
rack (>= 1.2.0)
225-
rack-test (1.1.0)
226-
rack (>= 1.0, < 3)
227-
rails (6.0.4.4)
228-
actioncable (= 6.0.4.4)
229-
actionmailbox (= 6.0.4.4)
230-
actionmailer (= 6.0.4.4)
231-
actionpack (= 6.0.4.4)
232-
actiontext (= 6.0.4.4)
233-
actionview (= 6.0.4.4)
234-
activejob (= 6.0.4.4)
235-
activemodel (= 6.0.4.4)
236-
activerecord (= 6.0.4.4)
237-
activestorage (= 6.0.4.4)
238-
activesupport (= 6.0.4.4)
239-
bundler (>= 1.3.0)
240-
railties (= 6.0.4.4)
242+
rack-test (2.0.2)
243+
rack (>= 1.3)
244+
rails (6.1.7)
245+
actioncable (= 6.1.7)
246+
actionmailbox (= 6.1.7)
247+
actionmailer (= 6.1.7)
248+
actionpack (= 6.1.7)
249+
actiontext (= 6.1.7)
250+
actionview (= 6.1.7)
251+
activejob (= 6.1.7)
252+
activemodel (= 6.1.7)
253+
activerecord (= 6.1.7)
254+
activestorage (= 6.1.7)
255+
activesupport (= 6.1.7)
256+
bundler (>= 1.15.0)
257+
railties (= 6.1.7)
241258
sprockets-rails (>= 2.0.0)
242259
rails-dom-testing (2.0.3)
243260
activesupport (>= 4.2.0)
244261
nokogiri (>= 1.6)
245262
rails-html-sanitizer (1.4.4)
246263
loofah (~> 2.19, >= 2.19.1)
247-
railties (6.0.4.4)
248-
actionpack (= 6.0.4.4)
249-
activesupport (= 6.0.4.4)
264+
railties (6.1.7)
265+
actionpack (= 6.1.7)
266+
activesupport (= 6.1.7)
250267
method_source
251-
rake (>= 0.8.7)
252-
thor (>= 0.20.3, < 2.0)
268+
rake (>= 12.2)
269+
thor (~> 1.0)
253270
rainbow (3.1.1)
254271
rake (13.0.6)
255272
rb-fsevent (0.10.4)
@@ -261,7 +278,7 @@ GEM
261278
msgpack (>= 0.4.3)
262279
optimist (>= 3.0.0)
263280
regexp_parser (1.8.2)
264-
request_store (1.5.0)
281+
request_store (1.5.1)
265282
rack (>= 1.4)
266283
responders (3.0.1)
267284
actionpack (>= 5.0)
@@ -333,29 +350,29 @@ GEM
333350
spring-watcher-listen (2.0.1)
334351
listen (>= 2.7, < 4.0)
335352
spring (>= 1.2, < 3.0)
336-
sprockets (4.0.2)
353+
sprockets (4.2.0)
337354
concurrent-ruby (~> 1.0)
338-
rack (> 1, < 3)
355+
rack (>= 2.2.4, < 4)
339356
sprockets-rails (3.4.2)
340357
actionpack (>= 5.2)
341358
activesupport (>= 5.2)
342359
sprockets (>= 3.0.0)
343360
sync (0.5.0)
344361
term-ansicolor (1.7.1)
345362
tins (~> 1.0)
346-
thor (1.1.0)
347-
thread_safe (0.3.6)
363+
thor (1.2.1)
364+
timeout (0.3.1)
348365
tins (1.26.0)
349366
sync
350-
tzinfo (1.2.9)
351-
thread_safe (~> 0.1)
367+
tzinfo (2.0.5)
368+
concurrent-ruby (~> 1.0)
352369
unf (0.1.4)
353370
unf_ext
354371
unf_ext (0.0.7.7)
355372
unicode-display_width (2.3.0)
356373
warden (1.2.9)
357374
rack (>= 2.0.9)
358-
warden-jwt_auth (0.6.0)
375+
warden-jwt_auth (0.7.0)
359376
dry-auto_inject (~> 0.8)
360377
dry-configurable (~> 0.13)
361378
jwt (~> 2.1)
@@ -370,7 +387,7 @@ GEM
370387
websocket-extensions (0.1.5)
371388
xpath (3.2.0)
372389
nokogiri (~> 1.8)
373-
zeitwerk (2.5.1)
390+
zeitwerk (2.6.6)
374391

375392
PLATFORMS
376393
ruby

better_together.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
2828

2929
spec.add_dependency 'devise'
3030
spec.add_dependency 'devise-jwt'
31-
spec.add_dependency 'rails', '>= 5.2.2', '< 6.1.0'
31+
spec.add_dependency 'rails', '>= 5.2.2', '< 7.1.0'
3232
spec.add_dependency 'friendly_id', '>= 5.2', '< 5.5'
3333
spec.add_dependency 'jsonapi-resources', '>= 0.10.0'
3434
spec.add_dependency 'mobility', '~> 0.8.6'

0 commit comments

Comments
 (0)