Skip to content

Commit baf7ee5

Browse files
committed
Rails 7.0.8.7
Concurrent-ruby stopped requiring a dependency that is breaking in Rails 7.0 applications. - ruby-concurrency/concurrent-ruby#1062 Rails has fixed this in 7.0 branch but as it is a bugfix and not a security issue they don't plan to release a point release at this time. - rails/rails#54264 When we update to Rails 7.1, we can remove this pinned version of concurrent-ruby.
1 parent b8a2667 commit baf7ee5

File tree

2 files changed

+69
-65
lines changed

2 files changed

+69
-65
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ gem 'aws-sdk-sqs'
1313
gem 'bootsnap'
1414
gem 'cancancan'
1515
gem 'cocoon'
16+
# Pin `concurrent-ruby` until we upgrade to Rails 7.1
17+
gem 'concurrent-ruby', '< 1.3.5'
1618
gem 'delayed_job_active_record'
1719
gem 'devise'
1820
gem 'flipflop'

Gemfile.lock

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -10,67 +10,67 @@ GIT
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (7.0.8.6)
14-
actionpack (= 7.0.8.6)
15-
activesupport (= 7.0.8.6)
13+
actioncable (7.0.8.7)
14+
actionpack (= 7.0.8.7)
15+
activesupport (= 7.0.8.7)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (7.0.8.6)
19-
actionpack (= 7.0.8.6)
20-
activejob (= 7.0.8.6)
21-
activerecord (= 7.0.8.6)
22-
activestorage (= 7.0.8.6)
23-
activesupport (= 7.0.8.6)
18+
actionmailbox (7.0.8.7)
19+
actionpack (= 7.0.8.7)
20+
activejob (= 7.0.8.7)
21+
activerecord (= 7.0.8.7)
22+
activestorage (= 7.0.8.7)
23+
activesupport (= 7.0.8.7)
2424
mail (>= 2.7.1)
2525
net-imap
2626
net-pop
2727
net-smtp
28-
actionmailer (7.0.8.6)
29-
actionpack (= 7.0.8.6)
30-
actionview (= 7.0.8.6)
31-
activejob (= 7.0.8.6)
32-
activesupport (= 7.0.8.6)
28+
actionmailer (7.0.8.7)
29+
actionpack (= 7.0.8.7)
30+
actionview (= 7.0.8.7)
31+
activejob (= 7.0.8.7)
32+
activesupport (= 7.0.8.7)
3333
mail (~> 2.5, >= 2.5.4)
3434
net-imap
3535
net-pop
3636
net-smtp
3737
rails-dom-testing (~> 2.0)
38-
actionpack (7.0.8.6)
39-
actionview (= 7.0.8.6)
40-
activesupport (= 7.0.8.6)
38+
actionpack (7.0.8.7)
39+
actionview (= 7.0.8.7)
40+
activesupport (= 7.0.8.7)
4141
rack (~> 2.0, >= 2.2.4)
4242
rack-test (>= 0.6.3)
4343
rails-dom-testing (~> 2.0)
4444
rails-html-sanitizer (~> 1.0, >= 1.2.0)
45-
actiontext (7.0.8.6)
46-
actionpack (= 7.0.8.6)
47-
activerecord (= 7.0.8.6)
48-
activestorage (= 7.0.8.6)
49-
activesupport (= 7.0.8.6)
45+
actiontext (7.0.8.7)
46+
actionpack (= 7.0.8.7)
47+
activerecord (= 7.0.8.7)
48+
activestorage (= 7.0.8.7)
49+
activesupport (= 7.0.8.7)
5050
globalid (>= 0.6.0)
5151
nokogiri (>= 1.8.5)
52-
actionview (7.0.8.6)
53-
activesupport (= 7.0.8.6)
52+
actionview (7.0.8.7)
53+
activesupport (= 7.0.8.7)
5454
builder (~> 3.1)
5555
erubi (~> 1.4)
5656
rails-dom-testing (~> 2.0)
5757
rails-html-sanitizer (~> 1.1, >= 1.2.0)
58-
activejob (7.0.8.6)
59-
activesupport (= 7.0.8.6)
58+
activejob (7.0.8.7)
59+
activesupport (= 7.0.8.7)
6060
globalid (>= 0.3.6)
61-
activemodel (7.0.8.6)
62-
activesupport (= 7.0.8.6)
63-
activerecord (7.0.8.6)
64-
activemodel (= 7.0.8.6)
65-
activesupport (= 7.0.8.6)
66-
activestorage (7.0.8.6)
67-
actionpack (= 7.0.8.6)
68-
activejob (= 7.0.8.6)
69-
activerecord (= 7.0.8.6)
70-
activesupport (= 7.0.8.6)
61+
activemodel (7.0.8.7)
62+
activesupport (= 7.0.8.7)
63+
activerecord (7.0.8.7)
64+
activemodel (= 7.0.8.7)
65+
activesupport (= 7.0.8.7)
66+
activestorage (7.0.8.7)
67+
actionpack (= 7.0.8.7)
68+
activejob (= 7.0.8.7)
69+
activerecord (= 7.0.8.7)
70+
activesupport (= 7.0.8.7)
7171
marcel (~> 1.0)
7272
mini_mime (>= 1.1.0)
73-
activesupport (7.0.8.6)
73+
activesupport (7.0.8.7)
7474
concurrent-ruby (~> 1.0, >= 1.0.2)
7575
i18n (>= 1.6, < 2)
7676
minitest (>= 5.1)
@@ -182,7 +182,7 @@ GEM
182182
dotenv-rails (3.1.4)
183183
dotenv (= 3.1.4)
184184
railties (>= 6.1)
185-
erubi (1.13.0)
185+
erubi (1.13.1)
186186
execjs (2.10.0)
187187
ffi (1.17.0)
188188
flipflop (2.8.0)
@@ -191,7 +191,7 @@ GEM
191191
globalid (1.2.1)
192192
activesupport (>= 6.1)
193193
hashie (5.0.0)
194-
i18n (1.14.6)
194+
i18n (1.14.7)
195195
concurrent-ruby (~> 1.0)
196196
jmespath (1.6.2)
197197
jquery-rails (4.6.0)
@@ -226,7 +226,7 @@ GEM
226226
activesupport (>= 4)
227227
railties (>= 4)
228228
request_store (~> 1.0)
229-
loofah (2.23.1)
229+
loofah (2.24.0)
230230
crass (~> 1.0.2)
231231
nokogiri (>= 1.12.0)
232232
mail (2.8.1)
@@ -250,17 +250,17 @@ GEM
250250
minitest (>= 5.0)
251251
ruby-progressbar
252252
msgpack (1.7.5)
253-
net-imap (0.5.1)
253+
net-imap (0.5.6)
254254
date
255255
net-protocol
256256
net-pop (0.1.2)
257257
net-protocol
258258
net-protocol (0.2.2)
259259
timeout
260-
net-smtp (0.5.0)
260+
net-smtp (0.5.1)
261261
net-protocol
262262
nio4r (2.7.4)
263-
nokogiri (1.17.1)
263+
nokogiri (1.18.3)
264264
mini_portile2 (~> 2.8.2)
265265
racc (~> 1.4)
266266
omniauth (2.1.2)
@@ -286,40 +286,40 @@ GEM
286286
puma (6.5.0)
287287
nio4r (~> 2.0)
288288
racc (1.8.1)
289-
rack (2.2.10)
289+
rack (2.2.11)
290290
rack-protection (3.2.0)
291291
base64 (>= 0.1.0)
292292
rack (~> 2.2, >= 2.2.4)
293293
rack-session (1.0.2)
294294
rack (< 3)
295-
rack-test (2.1.0)
295+
rack-test (2.2.0)
296296
rack (>= 1.3)
297-
rails (7.0.8.6)
298-
actioncable (= 7.0.8.6)
299-
actionmailbox (= 7.0.8.6)
300-
actionmailer (= 7.0.8.6)
301-
actionpack (= 7.0.8.6)
302-
actiontext (= 7.0.8.6)
303-
actionview (= 7.0.8.6)
304-
activejob (= 7.0.8.6)
305-
activemodel (= 7.0.8.6)
306-
activerecord (= 7.0.8.6)
307-
activestorage (= 7.0.8.6)
308-
activesupport (= 7.0.8.6)
297+
rails (7.0.8.7)
298+
actioncable (= 7.0.8.7)
299+
actionmailbox (= 7.0.8.7)
300+
actionmailer (= 7.0.8.7)
301+
actionpack (= 7.0.8.7)
302+
actiontext (= 7.0.8.7)
303+
actionview (= 7.0.8.7)
304+
activejob (= 7.0.8.7)
305+
activemodel (= 7.0.8.7)
306+
activerecord (= 7.0.8.7)
307+
activestorage (= 7.0.8.7)
308+
activesupport (= 7.0.8.7)
309309
bundler (>= 1.15.0)
310-
railties (= 7.0.8.6)
310+
railties (= 7.0.8.7)
311311
rails-dom-testing (2.2.0)
312312
activesupport (>= 5.0.0)
313313
minitest
314314
nokogiri (>= 1.6)
315-
rails-html-sanitizer (1.6.1)
315+
rails-html-sanitizer (1.6.2)
316316
loofah (~> 2.21)
317317
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
318318
rails-mermaid_erd (0.5.0)
319319
rails (>= 5.2)
320-
railties (7.0.8.6)
321-
actionpack (= 7.0.8.6)
322-
activesupport (= 7.0.8.6)
320+
railties (7.0.8.7)
321+
actionpack (= 7.0.8.7)
322+
activesupport (= 7.0.8.7)
323323
method_source
324324
rake (>= 12.2)
325325
thor (~> 1.0)
@@ -410,7 +410,7 @@ GEM
410410
thor (1.3.2)
411411
tilt (2.4.0)
412412
timecop (0.9.10)
413-
timeout (0.4.2)
413+
timeout (0.4.3)
414414
tzinfo (2.0.6)
415415
concurrent-ruby (~> 1.0)
416416
uglifier (4.2.1)
@@ -426,12 +426,13 @@ GEM
426426
bindex (>= 0.4.0)
427427
railties (>= 6.0.0)
428428
websocket (1.2.11)
429-
websocket-driver (0.7.6)
429+
websocket-driver (0.7.7)
430+
base64
430431
websocket-extensions (>= 0.1.0)
431432
websocket-extensions (0.1.5)
432433
xpath (3.2.0)
433434
nokogiri (~> 1.8)
434-
zeitwerk (2.7.1)
435+
zeitwerk (2.7.2)
435436
zip_tricks (5.6.0)
436437

437438
PLATFORMS
@@ -450,6 +451,7 @@ DEPENDENCIES
450451
capybara
451452
climate_control
452453
cocoon
454+
concurrent-ruby (< 1.3.5)
453455
delayed_job_active_record
454456
devise
455457
dotenv-rails

0 commit comments

Comments
 (0)