diff --git a/Gemfile.lock b/Gemfile.lock index 8686d1669ce79..62d1c823bdb13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,79 +32,79 @@ GIT PATH remote: . specs: - actioncable (6.0.4.6) - actionpack (= 6.0.4.6) + actioncable (6.0.4.7) + actionpack (= 6.0.4.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4.6) - actionpack (= 6.0.4.6) - activejob (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + actionmailbox (6.0.4.7) + actionpack (= 6.0.4.7) + activejob (= 6.0.4.7) + activerecord (= 6.0.4.7) + activestorage (= 6.0.4.7) + activesupport (= 6.0.4.7) mail (>= 2.7.1) - actionmailer (6.0.4.6) - actionpack (= 6.0.4.6) - actionview (= 6.0.4.6) - activejob (= 6.0.4.6) + actionmailer (6.0.4.7) + actionpack (= 6.0.4.7) + actionview (= 6.0.4.7) + activejob (= 6.0.4.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4.6) - actionview (= 6.0.4.6) - activesupport (= 6.0.4.6) + actionpack (6.0.4.7) + actionview (= 6.0.4.7) + activesupport (= 6.0.4.7) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.4.6) - actionpack (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + actiontext (6.0.4.7) + actionpack (= 6.0.4.7) + activerecord (= 6.0.4.7) + activestorage (= 6.0.4.7) + activesupport (= 6.0.4.7) nokogiri (>= 1.8.5) - actionview (6.0.4.6) - activesupport (= 6.0.4.6) + actionview (6.0.4.7) + activesupport (= 6.0.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4.6) - activesupport (= 6.0.4.6) + activejob (6.0.4.7) + activesupport (= 6.0.4.7) globalid (>= 0.3.6) - activemodel (6.0.4.6) - activesupport (= 6.0.4.6) - activerecord (6.0.4.6) - activemodel (= 6.0.4.6) - activesupport (= 6.0.4.6) - activestorage (6.0.4.6) - actionpack (= 6.0.4.6) - activejob (= 6.0.4.6) - activerecord (= 6.0.4.6) + activemodel (6.0.4.7) + activesupport (= 6.0.4.7) + activerecord (6.0.4.7) + activemodel (= 6.0.4.7) + activesupport (= 6.0.4.7) + activestorage (6.0.4.7) + actionpack (= 6.0.4.7) + activejob (= 6.0.4.7) + activerecord (= 6.0.4.7) marcel (~> 1.0.0) - activesupport (6.0.4.6) + activesupport (6.0.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - rails (6.0.4.6) - actioncable (= 6.0.4.6) - actionmailbox (= 6.0.4.6) - actionmailer (= 6.0.4.6) - actionpack (= 6.0.4.6) - actiontext (= 6.0.4.6) - actionview (= 6.0.4.6) - activejob (= 6.0.4.6) - activemodel (= 6.0.4.6) - activerecord (= 6.0.4.6) - activestorage (= 6.0.4.6) - activesupport (= 6.0.4.6) + rails (6.0.4.7) + actioncable (= 6.0.4.7) + actionmailbox (= 6.0.4.7) + actionmailer (= 6.0.4.7) + actionpack (= 6.0.4.7) + actiontext (= 6.0.4.7) + actionview (= 6.0.4.7) + activejob (= 6.0.4.7) + activemodel (= 6.0.4.7) + activerecord (= 6.0.4.7) + activestorage (= 6.0.4.7) + activesupport (= 6.0.4.7) bundler (>= 1.3.0) - railties (= 6.0.4.6) + railties (= 6.0.4.7) sprockets-rails (>= 2.0.0) - railties (6.0.4.6) - actionpack (= 6.0.4.6) - activesupport (= 6.0.4.6) + railties (6.0.4.7) + actionpack (= 6.0.4.7) + activesupport (= 6.0.4.7) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -280,7 +280,7 @@ GEM hiredis (0.6.3) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) diff --git a/RAILS_VERSION b/RAILS_VERSION index f12f54c6916ac..242f166a61de2 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -6.0.4.6 +6.0.4.7 diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md index 444954014fe9d..4e9f54bda3481 100644 --- a/actioncable/CHANGELOG.md +++ b/actioncable/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md index fd613214418ef..6661c0859dd89 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index fdaf35b3cfb35..0898979db0f7e 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 712567a1ca3c6..46704063397e0 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index 257f787f38939..0d569654cd0d6 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index e2dfe6d294fdd..f2be93e1d6c82 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index a051b37fec57e..90b05e0bbff7a 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index a85b21849a2a1..36495b280b1ca 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ede9626afa1a3..8bbfb2a059197 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 8fc3e6588d95e..776c622a7d36b 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* Added image transformation validation via configurable allow-list. + + Variant now offers a configurable allow-list for + transformation methods in addition to a configurable deny-list for arguments. + + [CVE-2022-21831] + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 430cef8f07247..b9f9b3f5cf261 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * Fix Reloader method signature to work with the new Executor signature diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index fb2c7ea7ca255..654e4132632d7 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 6ef557ca6393c..c8d15eec3dba0 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.4.7 (March 08, 2022) ## + +* No changes. + + ## Rails 6.0.4.6 (February 11, 2022) ## * No changes.