Skip to content

Commit 6e6eaeb

Browse files
authored
Merge pull request #2487 from Shopify/dependabot/bundler/rails-8.1.2
Bump rails from 8.1.1 to 8.1.2
2 parents 19a6c55 + 7132aff commit 6e6eaeb

24 files changed

+13063
-5679
lines changed

Gemfile.lock

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -34,76 +34,76 @@ GEM
3434
concurrent-ruby (~> 1.0)
3535
action_text-trix (2.1.16)
3636
railties
37-
actioncable (8.1.1)
38-
actionpack (= 8.1.1)
39-
activesupport (= 8.1.1)
37+
actioncable (8.1.2)
38+
actionpack (= 8.1.2)
39+
activesupport (= 8.1.2)
4040
nio4r (~> 2.0)
4141
websocket-driver (>= 0.6.1)
4242
zeitwerk (~> 2.6)
43-
actionmailbox (8.1.1)
44-
actionpack (= 8.1.1)
45-
activejob (= 8.1.1)
46-
activerecord (= 8.1.1)
47-
activestorage (= 8.1.1)
48-
activesupport (= 8.1.1)
43+
actionmailbox (8.1.2)
44+
actionpack (= 8.1.2)
45+
activejob (= 8.1.2)
46+
activerecord (= 8.1.2)
47+
activestorage (= 8.1.2)
48+
activesupport (= 8.1.2)
4949
mail (>= 2.8.0)
50-
actionmailer (8.1.1)
51-
actionpack (= 8.1.1)
52-
actionview (= 8.1.1)
53-
activejob (= 8.1.1)
54-
activesupport (= 8.1.1)
50+
actionmailer (8.1.2)
51+
actionpack (= 8.1.2)
52+
actionview (= 8.1.2)
53+
activejob (= 8.1.2)
54+
activesupport (= 8.1.2)
5555
mail (>= 2.8.0)
5656
rails-dom-testing (~> 2.2)
57-
actionpack (8.1.1)
58-
actionview (= 8.1.1)
59-
activesupport (= 8.1.1)
57+
actionpack (8.1.2)
58+
actionview (= 8.1.2)
59+
activesupport (= 8.1.2)
6060
nokogiri (>= 1.8.5)
6161
rack (>= 2.2.4)
6262
rack-session (>= 1.0.1)
6363
rack-test (>= 0.6.3)
6464
rails-dom-testing (~> 2.2)
6565
rails-html-sanitizer (~> 1.6)
6666
useragent (~> 0.16)
67-
actiontext (8.1.1)
67+
actiontext (8.1.2)
6868
action_text-trix (~> 2.1.15)
69-
actionpack (= 8.1.1)
70-
activerecord (= 8.1.1)
71-
activestorage (= 8.1.1)
72-
activesupport (= 8.1.1)
69+
actionpack (= 8.1.2)
70+
activerecord (= 8.1.2)
71+
activestorage (= 8.1.2)
72+
activesupport (= 8.1.2)
7373
globalid (>= 0.6.0)
7474
nokogiri (>= 1.8.5)
75-
actionview (8.1.1)
76-
activesupport (= 8.1.1)
75+
actionview (8.1.2)
76+
activesupport (= 8.1.2)
7777
builder (~> 3.1)
7878
erubi (~> 1.11)
7979
rails-dom-testing (~> 2.2)
8080
rails-html-sanitizer (~> 1.6)
81-
activejob (8.1.1)
82-
activesupport (= 8.1.1)
81+
activejob (8.1.2)
82+
activesupport (= 8.1.2)
8383
globalid (>= 0.3.6)
84-
activemodel (8.1.1)
85-
activesupport (= 8.1.1)
84+
activemodel (8.1.2)
85+
activesupport (= 8.1.2)
8686
activemodel-serializers-xml (1.0.3)
8787
activemodel (>= 5.0.0.a)
8888
activesupport (>= 5.0.0.a)
8989
builder (~> 3.1)
90-
activerecord (8.1.1)
91-
activemodel (= 8.1.1)
92-
activesupport (= 8.1.1)
90+
activerecord (8.1.2)
91+
activemodel (= 8.1.2)
92+
activesupport (= 8.1.2)
9393
timeout (>= 0.4.0)
9494
activerecord-typedstore (1.6.0)
9595
activerecord (>= 6.1)
9696
activeresource (6.2.0)
9797
activemodel (>= 7.0)
9898
activemodel-serializers-xml (~> 1.0)
9999
activesupport (>= 7.0)
100-
activestorage (8.1.1)
101-
actionpack (= 8.1.1)
102-
activejob (= 8.1.1)
103-
activerecord (= 8.1.1)
104-
activesupport (= 8.1.1)
100+
activestorage (8.1.2)
101+
actionpack (= 8.1.2)
102+
activejob (= 8.1.2)
103+
activerecord (= 8.1.2)
104+
activesupport (= 8.1.2)
105105
marcel (~> 1.0)
106-
activesupport (8.1.1)
106+
activesupport (8.1.2)
107107
base64
108108
bigdecimal
109109
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -155,7 +155,7 @@ GEM
155155
fiber-storage (1.0.1)
156156
frozen_record (0.27.4)
157157
activemodel
158-
globalid (1.2.1)
158+
globalid (1.3.0)
159159
activesupport (>= 6.1)
160160
google-protobuf (4.33.4)
161161
bigdecimal
@@ -206,12 +206,13 @@ GEM
206206
loofah (2.25.0)
207207
crass (~> 1.0.2)
208208
nokogiri (>= 1.12.0)
209-
mail (2.8.1)
209+
mail (2.9.0)
210+
logger
210211
mini_mime (>= 0.1.1)
211212
net-imap
212213
net-pop
213214
net-smtp
214-
marcel (1.0.4)
215+
marcel (1.1.0)
215216
mini_mime (1.1.5)
216217
minitest (5.27.0)
217218
minitest-hooks (1.5.3)
@@ -224,17 +225,17 @@ GEM
224225
mutex_m (0.3.0)
225226
net-http (0.4.1)
226227
uri
227-
net-imap (0.5.7)
228+
net-imap (0.6.2)
228229
date
229230
net-protocol
230231
net-pop (0.1.2)
231232
net-protocol
232233
net-protocol (0.2.2)
233234
timeout
234-
net-smtp (0.5.0)
235+
net-smtp (0.5.1)
235236
net-protocol
236237
netrc (0.11.0)
237-
nio4r (2.7.4)
238+
nio4r (2.7.5)
238239
nokogiri (1.19.0-aarch64-linux-gnu)
239240
racc (~> 1.4)
240241
nokogiri (1.19.0-aarch64-linux-musl)
@@ -269,30 +270,30 @@ GEM
269270
rack (>= 1.3)
270271
rackup (2.3.1)
271272
rack (>= 3)
272-
rails (8.1.1)
273-
actioncable (= 8.1.1)
274-
actionmailbox (= 8.1.1)
275-
actionmailer (= 8.1.1)
276-
actionpack (= 8.1.1)
277-
actiontext (= 8.1.1)
278-
actionview (= 8.1.1)
279-
activejob (= 8.1.1)
280-
activemodel (= 8.1.1)
281-
activerecord (= 8.1.1)
282-
activestorage (= 8.1.1)
283-
activesupport (= 8.1.1)
273+
rails (8.1.2)
274+
actioncable (= 8.1.2)
275+
actionmailbox (= 8.1.2)
276+
actionmailer (= 8.1.2)
277+
actionpack (= 8.1.2)
278+
actiontext (= 8.1.2)
279+
actionview (= 8.1.2)
280+
activejob (= 8.1.2)
281+
activemodel (= 8.1.2)
282+
activerecord (= 8.1.2)
283+
activestorage (= 8.1.2)
284+
activesupport (= 8.1.2)
284285
bundler (>= 1.15.0)
285-
railties (= 8.1.1)
286+
railties (= 8.1.2)
286287
rails-dom-testing (2.3.0)
287288
activesupport (>= 5.0.0)
288289
minitest
289290
nokogiri (>= 1.6)
290291
rails-html-sanitizer (1.6.2)
291292
loofah (~> 2.21)
292293
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)
293-
railties (8.1.1)
294-
actionpack (= 8.1.1)
295-
activesupport (= 8.1.1)
294+
railties (8.1.2)
295+
actionpack (= 8.1.2)
296+
activesupport (= 8.1.2)
296297
irb (~> 1.13)
297298
rackup (>= 1.0.0)
298299
rake (>= 12.2)
@@ -402,7 +403,8 @@ GEM
402403
addressable (>= 2.8.0)
403404
crack (>= 0.3.2)
404405
hashdiff (>= 0.4.0, < 2.0.0)
405-
websocket-driver (0.7.6)
406+
websocket-driver (0.8.0)
407+
base64
406408
websocket-extensions (>= 0.1.0)
407409
websocket-extensions (0.1.5)
408410
xpath (3.2.0)

sorbet/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
--ignore=/vendor
44
--enable-experimental-requires-ancestor
55
--enable-experimental-rbs-comments
6+
--suppress-payload-superclass-redefinition-for=Net::IMAP::CommandData

sorbet/rbi/dsl/active_support/callbacks.rbi

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)