Skip to content

Commit 23f8485

Browse files
eileencodeseileencodes
committed
Merge branch '6-0-sec' into 6-0-stable
2 parents f9c6da7 + 27a5ec7 commit 23f8485

39 files changed

Lines changed: 6173 additions & 6038 deletions

File tree

‎Gemfile.lock‎

Lines changed: 73 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -32,79 +32,79 @@ GIT
3232
PATH
3333
remote: .
3434
specs:
35-
actioncable (6.0.4.7)
36-
actionpack (= 6.0.4.7)
35+
actioncable (6.0.4.8)
36+
actionpack (= 6.0.4.8)
3737
nio4r (~> 2.0)
3838
websocket-driver (>= 0.6.1)
39-
actionmailbox (6.0.4.7)
40-
actionpack (= 6.0.4.7)
41-
activejob (= 6.0.4.7)
42-
activerecord (= 6.0.4.7)
43-
activestorage (= 6.0.4.7)
44-
activesupport (= 6.0.4.7)
39+
actionmailbox (6.0.4.8)
40+
actionpack (= 6.0.4.8)
41+
activejob (= 6.0.4.8)
42+
activerecord (= 6.0.4.8)
43+
activestorage (= 6.0.4.8)
44+
activesupport (= 6.0.4.8)
4545
mail (>= 2.7.1)
46-
actionmailer (6.0.4.7)
47-
actionpack (= 6.0.4.7)
48-
actionview (= 6.0.4.7)
49-
activejob (= 6.0.4.7)
46+
actionmailer (6.0.4.8)
47+
actionpack (= 6.0.4.8)
48+
actionview (= 6.0.4.8)
49+
activejob (= 6.0.4.8)
5050
mail (~> 2.5, >= 2.5.4)
5151
rails-dom-testing (~> 2.0)
52-
actionpack (6.0.4.7)
53-
actionview (= 6.0.4.7)
54-
activesupport (= 6.0.4.7)
52+
actionpack (6.0.4.8)
53+
actionview (= 6.0.4.8)
54+
activesupport (= 6.0.4.8)
5555
rack (~> 2.0, >= 2.0.8)
5656
rack-test (>= 0.6.3)
5757
rails-dom-testing (~> 2.0)
5858
rails-html-sanitizer (~> 1.0, >= 1.2.0)
59-
actiontext (6.0.4.7)
60-
actionpack (= 6.0.4.7)
61-
activerecord (= 6.0.4.7)
62-
activestorage (= 6.0.4.7)
63-
activesupport (= 6.0.4.7)
59+
actiontext (6.0.4.8)
60+
actionpack (= 6.0.4.8)
61+
activerecord (= 6.0.4.8)
62+
activestorage (= 6.0.4.8)
63+
activesupport (= 6.0.4.8)
6464
nokogiri (>= 1.8.5)
65-
actionview (6.0.4.7)
66-
activesupport (= 6.0.4.7)
65+
actionview (6.0.4.8)
66+
activesupport (= 6.0.4.8)
6767
builder (~> 3.1)
6868
erubi (~> 1.4)
6969
rails-dom-testing (~> 2.0)
7070
rails-html-sanitizer (~> 1.1, >= 1.2.0)
71-
activejob (6.0.4.7)
72-
activesupport (= 6.0.4.7)
71+
activejob (6.0.4.8)
72+
activesupport (= 6.0.4.8)
7373
globalid (>= 0.3.6)
74-
activemodel (6.0.4.7)
75-
activesupport (= 6.0.4.7)
76-
activerecord (6.0.4.7)
77-
activemodel (= 6.0.4.7)
78-
activesupport (= 6.0.4.7)
79-
activestorage (6.0.4.7)
80-
actionpack (= 6.0.4.7)
81-
activejob (= 6.0.4.7)
82-
activerecord (= 6.0.4.7)
74+
activemodel (6.0.4.8)
75+
activesupport (= 6.0.4.8)
76+
activerecord (6.0.4.8)
77+
activemodel (= 6.0.4.8)
78+
activesupport (= 6.0.4.8)
79+
activestorage (6.0.4.8)
80+
actionpack (= 6.0.4.8)
81+
activejob (= 6.0.4.8)
82+
activerecord (= 6.0.4.8)
8383
marcel (~> 1.0)
84-
activesupport (6.0.4.7)
84+
activesupport (6.0.4.8)
8585
concurrent-ruby (~> 1.0, >= 1.0.2)
8686
i18n (>= 0.7, < 2)
8787
minitest (~> 5.1)
8888
tzinfo (~> 1.1)
8989
zeitwerk (~> 2.2, >= 2.2.2)
90-
rails (6.0.4.7)
91-
actioncable (= 6.0.4.7)
92-
actionmailbox (= 6.0.4.7)
93-
actionmailer (= 6.0.4.7)
94-
actionpack (= 6.0.4.7)
95-
actiontext (= 6.0.4.7)
96-
actionview (= 6.0.4.7)
97-
activejob (= 6.0.4.7)
98-
activemodel (= 6.0.4.7)
99-
activerecord (= 6.0.4.7)
100-
activestorage (= 6.0.4.7)
101-
activesupport (= 6.0.4.7)
90+
rails (6.0.4.8)
91+
actioncable (= 6.0.4.8)
92+
actionmailbox (= 6.0.4.8)
93+
actionmailer (= 6.0.4.8)
94+
actionpack (= 6.0.4.8)
95+
actiontext (= 6.0.4.8)
96+
actionview (= 6.0.4.8)
97+
activejob (= 6.0.4.8)
98+
activemodel (= 6.0.4.8)
99+
activerecord (= 6.0.4.8)
100+
activestorage (= 6.0.4.8)
101+
activesupport (= 6.0.4.8)
102102
bundler (>= 1.3.0)
103-
railties (= 6.0.4.7)
103+
railties (= 6.0.4.8)
104104
sprockets-rails (>= 2.0.0)
105-
railties (6.0.4.7)
106-
actionpack (= 6.0.4.7)
107-
activesupport (= 6.0.4.7)
105+
railties (6.0.4.8)
106+
actionpack (= 6.0.4.8)
107+
activesupport (= 6.0.4.8)
108108
method_source
109109
rake (>= 0.8.7)
110110
thor (>= 0.20.3, < 2.0)
@@ -204,6 +204,7 @@ GEM
204204
delayed_job_active_record (4.1.6)
205205
activerecord (>= 3.0, < 6.2)
206206
delayed_job (>= 3.0, < 5)
207+
digest (3.1.0)
207208
digest-crc (0.6.3)
208209
rake (>= 12.0.0, < 14.0.0)
209210
em-http-request (1.1.7)
@@ -292,12 +293,13 @@ GEM
292293
mustache
293294
nokogiri
294295
libxml-ruby (3.2.1)
295-
loofah (2.14.0)
296+
loofah (2.16.0)
296297
crass (~> 1.0.2)
297298
nokogiri (>= 1.5.9)
298299
mail (2.7.1)
299300
mini_mime (>= 0.1.1)
300301
marcel (1.0.2)
302+
matrix (0.4.2)
301303
memoist (0.16.2)
302304
method_source (1.0.0)
303305
mini_magick (4.11.0)
@@ -324,12 +326,24 @@ GEM
324326
mustermann (1.1.1)
325327
ruby2_keywords (~> 0.0.1)
326328
mysql2 (0.5.3)
329+
net-imap (0.2.3)
330+
digest
331+
net-protocol
332+
strscan
333+
net-pop (0.1.1)
334+
digest
335+
net-protocol
336+
timeout
337+
net-protocol (0.1.3)
338+
timeout
339+
net-smtp (0.3.1)
340+
digest
341+
net-protocol
342+
timeout
327343
nio4r (2.5.7)
328344
nokogiri (1.11.3)
329345
mini_portile2 (~> 2.5.0)
330346
racc (~> 1.4)
331-
nokogiri (1.11.3-x86_64-darwin)
332-
racc (~> 1.4)
333347
os (1.1.1)
334348
parallel (1.20.1)
335349
parser (3.0.1.1)
@@ -462,6 +476,7 @@ GEM
462476
sprockets (>= 3.0.0)
463477
sqlite3 (1.4.2)
464478
stackprof (0.2.17)
479+
strscan (3.0.1)
465480
sucker_punch (3.0.1)
466481
concurrent-ruby (~> 1.0)
467482
thin (1.8.0)
@@ -471,6 +486,7 @@ GEM
471486
thor (1.1.0)
472487
thread_safe (0.3.6)
473488
tilt (2.0.10)
489+
timeout (0.2.0)
474490
trailblazer-option (0.1.1)
475491
turbolinks (5.2.1)
476492
turbolinks-source (~> 5.2)
@@ -539,11 +555,15 @@ DEPENDENCIES
539555
kindlerb (~> 1.2.0)
540556
libxml-ruby
541557
listen (~> 3.2)!
558+
matrix
542559
minitest (< 5.15.0)
543560
minitest-bisect
544561
minitest-reporters
545562
minitest-retry
546563
mysql2 (>= 0.4.10)
564+
net-imap
565+
net-pop
566+
net-smtp
547567
nokogiri (>= 1.8.1)
548568
pg (>= 0.18.0)
549569
psych (~> 3.0)

‎RAILS_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.4.7
1+
6.0.4.8

‎actioncable/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.0.4.8 (April 26, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.0.4.7 (March 08, 2022) ##
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 = 6
1111
MINOR = 0
1212
TINY = 4
13-
PRE = "7"
13+
PRE = "8"
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": "6.0.4-7",
3+
"version": "6.0.4-8",
44
"description": "WebSocket framework for Ruby on Rails.",
55
"main": "app/assets/javascripts/action_cable.js",
66
"files": [

‎actionmailbox/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.0.4.8 (April 26, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.0.4.7 (March 08, 2022) ##
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 = 6
1111
MINOR = 0
1212
TINY = 4
13-
PRE = "7"
13+
PRE = "8"
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 6.0.4.8 (April 26, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.0.4.7 (March 08, 2022) ##
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 = 6
1111
MINOR = 0
1212
TINY = 4
13-
PRE = "7"
13+
PRE = "8"
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
@@ -1,3 +1,9 @@
1+
## Rails 6.0.4.8 (April 26, 2022) ##
2+
3+
* Allow Content Security Policy DSL to generate for API responses.
4+
5+
*Tim Wade*
6+
17
## Rails 6.0.4.7 (March 08, 2022) ##
28

39
* No changes.

0 commit comments

Comments
 (0)