Skip to content

Commit ed84c0d

Browse files
jhawthornjhawthorn
committed
Merge branch '7-1-sec' into 7-1-stable
2 parents e711c4a + 6f0d1ad commit ed84c0d

File tree

36 files changed

+4961
-4932
lines changed

36 files changed

+4961
-4932
lines changed

‎Gemfile.lock‎

Lines changed: 53 additions & 59 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.1)
14-
actionpack (= 7.1.3.1)
15-
activesupport (= 7.1.3.1)
13+
actioncable (7.1.3.2)
14+
actionpack (= 7.1.3.2)
15+
activesupport (= 7.1.3.2)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (7.1.3.1)
20-
actionpack (= 7.1.3.1)
21-
activejob (= 7.1.3.1)
22-
activerecord (= 7.1.3.1)
23-
activestorage (= 7.1.3.1)
24-
activesupport (= 7.1.3.1)
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)
2525
mail (>= 2.7.1)
2626
net-imap
2727
net-pop
2828
net-smtp
29-
actionmailer (7.1.3.1)
30-
actionpack (= 7.1.3.1)
31-
actionview (= 7.1.3.1)
32-
activejob (= 7.1.3.1)
33-
activesupport (= 7.1.3.1)
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)
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.1)
40-
actionview (= 7.1.3.1)
41-
activesupport (= 7.1.3.1)
39+
actionpack (7.1.3.2)
40+
actionview (= 7.1.3.2)
41+
activesupport (= 7.1.3.2)
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.1)
50-
actionpack (= 7.1.3.1)
51-
activerecord (= 7.1.3.1)
52-
activestorage (= 7.1.3.1)
53-
activesupport (= 7.1.3.1)
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)
5454
globalid (>= 0.6.0)
5555
nokogiri (>= 1.8.5)
56-
actionview (7.1.3.1)
57-
activesupport (= 7.1.3.1)
56+
actionview (7.1.3.2)
57+
activesupport (= 7.1.3.2)
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.1)
63-
activesupport (= 7.1.3.1)
62+
activejob (7.1.3.2)
63+
activesupport (= 7.1.3.2)
6464
globalid (>= 0.3.6)
65-
activemodel (7.1.3.1)
66-
activesupport (= 7.1.3.1)
67-
activerecord (7.1.3.1)
68-
activemodel (= 7.1.3.1)
69-
activesupport (= 7.1.3.1)
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)
7070
timeout (>= 0.4.0)
71-
activestorage (7.1.3.1)
72-
actionpack (= 7.1.3.1)
73-
activejob (= 7.1.3.1)
74-
activerecord (= 7.1.3.1)
75-
activesupport (= 7.1.3.1)
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)
7676
marcel (~> 1.0)
77-
activesupport (7.1.3.1)
77+
activesupport (7.1.3.2)
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.1)
88-
actioncable (= 7.1.3.1)
89-
actionmailbox (= 7.1.3.1)
90-
actionmailer (= 7.1.3.1)
91-
actionpack (= 7.1.3.1)
92-
actiontext (= 7.1.3.1)
93-
actionview (= 7.1.3.1)
94-
activejob (= 7.1.3.1)
95-
activemodel (= 7.1.3.1)
96-
activerecord (= 7.1.3.1)
97-
activestorage (= 7.1.3.1)
98-
activesupport (= 7.1.3.1)
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)
9999
bundler (>= 1.15.0)
100-
railties (= 7.1.3.1)
101-
railties (7.1.3.1)
102-
actionpack (= 7.1.3.1)
103-
activesupport (= 7.1.3.1)
100+
railties (= 7.1.3.2)
101+
railties (7.1.3.2)
102+
actionpack (= 7.1.3.2)
103+
activesupport (= 7.1.3.2)
104104
irb
105105
rackup (>= 1.0.0)
106106
rake (>= 12.2)
@@ -351,10 +351,6 @@ GEM
351351
nokogiri (1.15.4)
352352
mini_portile2 (~> 2.8.2)
353353
racc (~> 1.4)
354-
nokogiri (1.15.4-x86_64-darwin)
355-
racc (~> 1.4)
356-
nokogiri (1.15.4-x86_64-linux)
357-
racc (~> 1.4)
358354
os (1.1.4)
359355
parallel (1.22.1)
360356
parser (3.2.1.1)
@@ -500,8 +496,6 @@ GEM
500496
sprockets (>= 3.0.0)
501497
sqlite3 (1.6.6)
502498
mini_portile2 (~> 2.8.0)
503-
sqlite3 (1.6.6-x86_64-darwin)
504-
sqlite3 (1.6.6-x86_64-linux)
505499
stackprof (0.2.23)
506500
stimulus-rails (1.2.1)
507501
railties (>= 6.0.0)

‎RAILS_VERSION‎

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

‎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.2 (February 21, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.1 (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 = "1"
13+
PRE = "2"
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-1",
3+
"version": "7.1.3-2",
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.2 (February 21, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.1 (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 = "1"
13+
PRE = "2"
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.2 (February 21, 2024) ##
2+
3+
* No changes.
4+
5+
16
## Rails 7.1.3.1 (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 = "1"
13+
PRE = "2"
1414

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

‎actionpack/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
*Jean Boussier*
88

9+
## Rails 7.1.3.2 (February 21, 2024) ##
10+
11+
* Fix `raise_on_missing_translations` not working correctly with the
12+
`translate` method in controllers after the patch for CVE-2024-26143.
13+
914
## Rails 7.1.3.1 (February 21, 2024) ##
1015

1116
* Fix possible XSS vulnerability with the `translate` method in controllers

0 commit comments

Comments
 (0)