Skip to content

Commit 0dc6be2

Browse files
rafaelfrancarafaelfranca
committed
Merge branch 'rm-trix-7-1' into 7-1-stable
2 parents 1c3456e + 747a03b commit 0dc6be2

File tree

34 files changed

+241
-110
lines changed

34 files changed

+241
-110
lines changed

‎Gemfile.lock

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,71 +10,71 @@ GIT
1010
PATH
1111
remote: .
1212
specs:
13-
actioncable (7.1.3.2)
14-
actionpack (= 7.1.3.2)
15-
activesupport (= 7.1.3.2)
13+
actioncable (7.1.3.3)
14+
actionpack (= 7.1.3.3)
15+
activesupport (= 7.1.3.3)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (7.1.3.2)
20-
actionpack (= 7.1.3.2)
21-
activejob (= 7.1.3.2)
22-
activerecord (= 7.1.3.2)
23-
activestorage (= 7.1.3.2)
24-
activesupport (= 7.1.3.2)
19+
actionmailbox (7.1.3.3)
20+
actionpack (= 7.1.3.3)
21+
activejob (= 7.1.3.3)
22+
activerecord (= 7.1.3.3)
23+
activestorage (= 7.1.3.3)
24+
activesupport (= 7.1.3.3)
2525
mail (>= 2.7.1)
2626
net-imap
2727
net-pop
2828
net-smtp
29-
actionmailer (7.1.3.2)
30-
actionpack (= 7.1.3.2)
31-
actionview (= 7.1.3.2)
32-
activejob (= 7.1.3.2)
33-
activesupport (= 7.1.3.2)
29+
actionmailer (7.1.3.3)
30+
actionpack (= 7.1.3.3)
31+
actionview (= 7.1.3.3)
32+
activejob (= 7.1.3.3)
33+
activesupport (= 7.1.3.3)
3434
mail (~> 2.5, >= 2.5.4)
3535
net-imap
3636
net-pop
3737
net-smtp
3838
rails-dom-testing (~> 2.2)
39-
actionpack (7.1.3.2)
40-
actionview (= 7.1.3.2)
41-
activesupport (= 7.1.3.2)
39+
actionpack (7.1.3.3)
40+
actionview (= 7.1.3.3)
41+
activesupport (= 7.1.3.3)
4242
nokogiri (>= 1.8.5)
4343
racc
4444
rack (>= 2.2.4)
4545
rack-session (>= 1.0.1)
4646
rack-test (>= 0.6.3)
4747
rails-dom-testing (~> 2.2)
4848
rails-html-sanitizer (~> 1.6)
49-
actiontext (7.1.3.2)
50-
actionpack (= 7.1.3.2)
51-
activerecord (= 7.1.3.2)
52-
activestorage (= 7.1.3.2)
53-
activesupport (= 7.1.3.2)
49+
actiontext (7.1.3.3)
50+
actionpack (= 7.1.3.3)
51+
activerecord (= 7.1.3.3)
52+
activestorage (= 7.1.3.3)
53+
activesupport (= 7.1.3.3)
5454
globalid (>= 0.6.0)
5555
nokogiri (>= 1.8.5)
56-
actionview (7.1.3.2)
57-
activesupport (= 7.1.3.2)
56+
actionview (7.1.3.3)
57+
activesupport (= 7.1.3.3)
5858
builder (~> 3.1)
5959
erubi (~> 1.11)
6060
rails-dom-testing (~> 2.2)
6161
rails-html-sanitizer (~> 1.6)
62-
activejob (7.1.3.2)
63-
activesupport (= 7.1.3.2)
62+
activejob (7.1.3.3)
63+
activesupport (= 7.1.3.3)
6464
globalid (>= 0.3.6)
65-
activemodel (7.1.3.2)
66-
activesupport (= 7.1.3.2)
67-
activerecord (7.1.3.2)
68-
activemodel (= 7.1.3.2)
69-
activesupport (= 7.1.3.2)
65+
activemodel (7.1.3.3)
66+
activesupport (= 7.1.3.3)
67+
activerecord (7.1.3.3)
68+
activemodel (= 7.1.3.3)
69+
activesupport (= 7.1.3.3)
7070
timeout (>= 0.4.0)
71-
activestorage (7.1.3.2)
72-
actionpack (= 7.1.3.2)
73-
activejob (= 7.1.3.2)
74-
activerecord (= 7.1.3.2)
75-
activesupport (= 7.1.3.2)
71+
activestorage (7.1.3.3)
72+
actionpack (= 7.1.3.3)
73+
activejob (= 7.1.3.3)
74+
activerecord (= 7.1.3.3)
75+
activesupport (= 7.1.3.3)
7676
marcel (~> 1.0)
77-
activesupport (7.1.3.2)
77+
activesupport (7.1.3.3)
7878
base64
7979
bigdecimal
8080
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -84,23 +84,23 @@ PATH
8484
minitest (>= 5.1, < 5.22.0)
8585
mutex_m
8686
tzinfo (~> 2.0)
87-
rails (7.1.3.2)
88-
actioncable (= 7.1.3.2)
89-
actionmailbox (= 7.1.3.2)
90-
actionmailer (= 7.1.3.2)
91-
actionpack (= 7.1.3.2)
92-
actiontext (= 7.1.3.2)
93-
actionview (= 7.1.3.2)
94-
activejob (= 7.1.3.2)
95-
activemodel (= 7.1.3.2)
96-
activerecord (= 7.1.3.2)
97-
activestorage (= 7.1.3.2)
98-
activesupport (= 7.1.3.2)
87+
rails (7.1.3.3)
88+
actioncable (= 7.1.3.3)
89+
actionmailbox (= 7.1.3.3)
90+
actionmailer (= 7.1.3.3)
91+
actionpack (= 7.1.3.3)
92+
actiontext (= 7.1.3.3)
93+
actionview (= 7.1.3.3)
94+
activejob (= 7.1.3.3)
95+
activemodel (= 7.1.3.3)
96+
activerecord (= 7.1.3.3)
97+
activestorage (= 7.1.3.3)
98+
activesupport (= 7.1.3.3)
9999
bundler (>= 1.15.0)
100-
railties (= 7.1.3.2)
101-
railties (7.1.3.2)
102-
actionpack (= 7.1.3.2)
103-
activesupport (= 7.1.3.2)
100+
railties (= 7.1.3.3)
101+
railties (7.1.3.3)
102+
actionpack (= 7.1.3.3)
103+
activesupport (= 7.1.3.3)
104104
irb
105105
rackup (>= 1.0.0)
106106
rake (>= 12.2)
@@ -149,7 +149,7 @@ GEM
149149
bcrypt (3.1.18)
150150
beaneater (1.1.3)
151151
benchmark-ips (2.10.0)
152-
bigdecimal (3.1.6)
152+
bigdecimal (3.1.8)
153153
bindex (0.8.1)
154154
bootsnap (1.15.0)
155155
msgpack (~> 1.2)
@@ -192,8 +192,7 @@ GEM
192192
delayed_job (>= 3.0, < 5)
193193
digest-crc (0.6.4)
194194
rake (>= 12.0.0, < 14.0.0)
195-
drb (2.2.0)
196-
ruby2_keywords
195+
drb (2.2.1)
197196
erubi (1.12.0)
198197
et-orbi (1.2.7)
199198
tzinfo
@@ -266,7 +265,7 @@ GEM
266265
signet (>= 0.16, < 2.a)
267266
hashdiff (1.0.1)
268267
httpclient (2.8.3)
269-
i18n (1.14.1)
268+
i18n (1.14.5)
270269
concurrent-ruby (~> 1.0)
271270
image_processing (1.12.2)
272271
mini_magick (>= 4.9.5, < 5)
@@ -304,7 +303,7 @@ GEM
304303
net-imap
305304
net-pop
306305
net-smtp
307-
marcel (1.0.2)
306+
marcel (1.0.4)
308307
matrix (0.4.2)
309308
mdl (0.13.0)
310309
kramdown (~> 2.3)
@@ -339,14 +338,14 @@ GEM
339338
mysql2 (0.5.6)
340339
net-http-persistent (4.0.1)
341340
connection_pool (~> 2.2)
342-
net-imap (0.4.10)
341+
net-imap (0.4.11)
343342
date
344343
net-protocol
345344
net-pop (0.1.2)
346345
net-protocol
347346
net-protocol (0.2.2)
348347
timeout
349-
net-smtp (0.4.0.1)
348+
net-smtp (0.5.0)
350349
net-protocol
351350
nio4r (2.5.9)
352351
nokogiri (1.15.4)
@@ -555,7 +554,7 @@ GEM
555554
websocket-extensions (0.1.5)
556555
xpath (3.2.0)
557556
nokogiri (~> 1.8)
558-
zeitwerk (2.6.13)
557+
zeitwerk (2.6.14)
559558

560559
PLATFORMS
561560
ruby

‎RAILS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.3.2
1+
7.1.3.3

‎actioncable/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 7.1.3.3 (May 16, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.2 (February 21, 2024) ##
27

38
* No changes.

‎actioncable/lib/action_cable/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 7
1111
MINOR = 1
1212
TINY = 3
13-
PRE = "2"
13+
PRE = "3"
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actioncable/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rails/actioncable",
3-
"version": "7.1.3-2",
3+
"version": "7.1.3-3",
44
"description": "WebSocket framework for Ruby on Rails.",
55
"module": "app/assets/javascripts/actioncable.esm.js",
66
"main": "app/assets/javascripts/actioncable.js",

‎actionmailbox/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 7.1.3.3 (May 16, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.2 (February 21, 2024) ##
27

38
* No changes.

‎actionmailbox/lib/action_mailbox/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 7
1111
MINOR = 1
1212
TINY = 3
13-
PRE = "2"
13+
PRE = "3"
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actionmailer/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 7.1.3.3 (May 16, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.2 (February 21, 2024) ##
27

38
* No changes.

‎actionmailer/lib/action_mailer/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 7
1111
MINOR = 1
1212
TINY = 3
13-
PRE = "2"
13+
PRE = "3"
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actionpack/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
2828
*Jean Boussier*
2929
30+
31+
## Rails 7.1.3.3 (May 16, 2024) ##
32+
33+
* No changes.
34+
35+
3036
## Rails 7.1.3.2 (February 21, 2024) ##
3137
3238
* Fix `raise_on_missing_translations` not working correctly with the

0 commit comments

Comments
 (0)