From 33beb0a38db1c058123a8e3cc298cad918adfe32 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Tue, 10 Dec 2024 13:40:12 -0800 Subject: [PATCH] Preparing for 7.2.2.1 release --- Gemfile.lock | 106 +++++++++--------- RAILS_VERSION | 2 +- actioncable/CHANGELOG.md | 5 + actioncable/lib/action_cable/gem_version.rb | 2 +- actioncable/package.json | 2 +- actionmailbox/CHANGELOG.md | 5 + .../lib/action_mailbox/gem_version.rb | 2 +- actionmailer/CHANGELOG.md | 5 + actionmailer/lib/action_mailer/gem_version.rb | 2 +- actionpack/CHANGELOG.md | 2 + actionpack/lib/action_pack/gem_version.rb | 2 +- actiontext/CHANGELOG.md | 2 + actiontext/lib/action_text/gem_version.rb | 2 +- actiontext/package.json | 2 +- actionview/CHANGELOG.md | 5 + actionview/lib/action_view/gem_version.rb | 2 +- activejob/CHANGELOG.md | 5 + activejob/lib/active_job/gem_version.rb | 2 +- activemodel/CHANGELOG.md | 5 + activemodel/lib/active_model/gem_version.rb | 2 +- activerecord/CHANGELOG.md | 5 + activerecord/lib/active_record/gem_version.rb | 2 +- activestorage/CHANGELOG.md | 5 + .../lib/active_storage/gem_version.rb | 2 +- activestorage/package.json | 2 +- activesupport/CHANGELOG.md | 5 + .../lib/active_support/gem_version.rb | 2 +- guides/CHANGELOG.md | 5 + railties/CHANGELOG.md | 5 + railties/lib/rails/gem_version.rb | 2 +- yarn.lock | 26 ++++- 31 files changed, 148 insertions(+), 75 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e201cccf6e8ae..855f2846e36e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,29 +19,29 @@ GIT PATH remote: . specs: - actioncable (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + actioncable (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actionmailbox (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) - actionmailer (7.2.2) - actionpack (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activesupport (= 7.2.2) + actionmailer (7.2.2.1) + actionpack (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2) - actionview (= 7.2.2) - activesupport (= 7.2.2) + actionpack (7.2.2.1) + actionview (= 7.2.2.1) + activesupport (= 7.2.2.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -50,35 +50,35 @@ PATH rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.2) - actionpack (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actiontext (7.2.2.1) + actionpack (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.2) - activesupport (= 7.2.2) + actionview (7.2.2.1) + activesupport (= 7.2.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.2.2) - activesupport (= 7.2.2) + activejob (7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.3.6) - activemodel (7.2.2) - activesupport (= 7.2.2) - activerecord (7.2.2) - activemodel (= 7.2.2) - activesupport (= 7.2.2) + activemodel (7.2.2.1) + activesupport (= 7.2.2.1) + activerecord (7.2.2.1) + activemodel (= 7.2.2.1) + activesupport (= 7.2.2.1) timeout (>= 0.4.0) - activestorage (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activesupport (= 7.2.2) + activestorage (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activesupport (= 7.2.2.1) marcel (~> 1.0) - activesupport (7.2.2) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -90,23 +90,23 @@ PATH minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - rails (7.2.2) - actioncable (= 7.2.2) - actionmailbox (= 7.2.2) - actionmailer (= 7.2.2) - actionpack (= 7.2.2) - actiontext (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activemodel (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + rails (7.2.2.1) + actioncable (= 7.2.2.1) + actionmailbox (= 7.2.2.1) + actionmailer (= 7.2.2.1) + actionpack (= 7.2.2.1) + actiontext (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activemodel (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) bundler (>= 1.15.0) - railties (= 7.2.2) - railties (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + railties (= 7.2.2.1) + railties (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) diff --git a/RAILS_VERSION b/RAILS_VERSION index 77f5bec5b2b4f..76e7f7f6937d8 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -7.2.2 +7.2.2.1 diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md index 8d5eaafd29361..6702bf4d15984 100644 --- a/actioncable/CHANGELOG.md +++ b/actioncable/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb index 6e4c73a19ebbb..9e9ac0c51d9a8 100644 --- a/actioncable/lib/action_cable/gem_version.rb +++ b/actioncable/lib/action_cable/gem_version.rb @@ -12,7 +12,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actioncable/package.json b/actioncable/package.json index 4ab27b4605d8a..c5116e16cecb5 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actioncable", - "version": "7.2.200", + "version": "7.2.201", "description": "WebSocket framework for Ruby on Rails.", "module": "app/assets/javascripts/actioncable.esm.js", "main": "app/assets/javascripts/actioncable.js", diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md index 4122af56a4044..aa02f1eeb08ae 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb index 27259e7b0267d..0773f0c4f0012 100644 --- a/actionmailbox/lib/action_mailbox/gem_version.rb +++ b/actionmailbox/lib/action_mailbox/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index b072923f31296..0af4290ed05b1 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index 5dfefe2c7b429..6ca071fba9d4f 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 047b5be3fe016..67e8d20e54974 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + * Add validation to content security policies to disallow spaces and semicolons. Developers should use multiple arguments, and different directive methods instead. diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index 6bab238fe7a4c..9cf274b938c76 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -12,7 +12,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index c2a9242906a7a..b5ac076b55a9e 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + * Update vendored trix version to 2.1.10 *John Hawthorn* diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb index 566433e49d739..a6fe8fd78cd4f 100644 --- a/actiontext/lib/action_text/gem_version.rb +++ b/actiontext/lib/action_text/gem_version.rb @@ -12,7 +12,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/package.json b/actiontext/package.json index 1813bf26c27f5..7c1aa8cb87d69 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actiontext", - "version": "7.2.200", + "version": "7.2.201", "description": "Edit and display rich text in Rails applications", "module": "app/assets/javascripts/actiontext.esm.js", "main": "app/assets/javascripts/actiontext.js", diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 2d2fdd4e18a7a..1e7ac461e75c9 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index 89ffdf300f8a3..fec5642e0edb1 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index 2dfdb19d74a09..d00fbc4a7bf7a 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index 41f7822310db0..0f2e3f535cd1a 100644 --- a/activejob/lib/active_job/gem_version.rb +++ b/activejob/lib/active_job/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index e8e87c91885fb..e0427e1eba00d 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * Fix regression in `alias_attribute` to work with user defined methods. diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index 1f92c457d5845..c18cb2e7a28bc 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 951669644aec0..9ccc812c5fa37 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * Fix support for `query_cache: false` in `database.yml`. diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index 2e3f995d38418..07883ba9ba94c 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 72f8081617394..7c505fdd23d64 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb index f4c5df370e301..5e481f51ed73f 100644 --- a/activestorage/lib/active_storage/gem_version.rb +++ b/activestorage/lib/active_storage/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/package.json b/activestorage/package.json index 37c7def7f4a60..701328e77cd46 100644 --- a/activestorage/package.json +++ b/activestorage/package.json @@ -1,6 +1,6 @@ { "name": "@rails/activestorage", - "version": "7.2.200", + "version": "7.2.201", "description": "Attach cloud and local files in Rails applications", "module": "app/assets/javascripts/activestorage.esm.js", "main": "app/assets/javascripts/activestorage.js", diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index f6c5069de5875..aebc65e5ce821 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`. diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index cfaab7a76ea57..743d9a95d60e0 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index 1c773cf85f2b4..3476a41ef19ef 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index ac7d1dc27aee0..aa95ec74645bb 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 7.2.2.1 (December 10, 2024) ## + +* No changes. + + ## Rails 7.2.2 (October 30, 2024) ## * No changes. diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index 4629062933be6..c497b65b58d46 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -10,7 +10,7 @@ module VERSION MAJOR = 7 MINOR = 2 TINY = 2 - PRE = nil + PRE = "1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/yarn.lock b/yarn.lock index 0cf1507a89ee1..4c780e5c01938 100644 --- a/yarn.lock +++ b/yarn.lock @@ -71,17 +71,17 @@ "@jridgewell/sourcemap-codec" "^1.4.14" "@rails/actioncable@file:/Users/jhawthorn/src/rails-release/actioncable": - version "7.2.200" + version "7.2.201" resolved "file:actioncable" "@rails/actiontext@file:/Users/jhawthorn/src/rails-release/actiontext": - version "7.2.200" + version "7.2.201" resolved "file:actiontext" dependencies: "@rails/activestorage" ">= 7.2.0-alpha" "@rails/activestorage@>= 7.2.0-alpha", "@rails/activestorage@file:/Users/jhawthorn/src/rails-release/activestorage": - version "7.2.200" + version "7.2.201" resolved "file:activestorage" dependencies: spark-md5 "^3.0.1" @@ -161,6 +161,11 @@ dependencies: "@types/node" "*" +"@types/trusted-types@^2.0.7": + version "2.0.7" + resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz" @@ -1548,6 +1553,13 @@ domain-browser@^1.1.1: resolved "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== +dompurify@^3.2.3: + version "3.2.3" + resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz" + integrity sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA== + optionalDependencies: + "@types/trusted-types" "^2.0.7" + duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz" @@ -4772,9 +4784,11 @@ tough-cookie@~2.4.3: punycode "^1.4.1" trix@^2.0.0: - version "2.1.7" - resolved "https://registry.npmjs.org/trix/-/trix-2.1.7.tgz" - integrity sha512-RyFmjLJfxP2nuAKqgVqJ40wk4qoYfDQtyi71q6ozkP+X4EOILe+j5ll5g/suvTyMx7BacGszNWzjnx9Vbj17sw== + version "2.1.10" + resolved "https://registry.npmjs.org/trix/-/trix-2.1.10.tgz" + integrity sha512-PrMOKriE76tJbjqiOFpjTiRkOomWBiGPT/YrBw83HJ5SlFAcybYZVjVlkDkOrFZoYI4qCfWUw42BTAjSE9KSYQ== + dependencies: + dompurify "^3.2.3" tsconfig-paths@^3.15.0: version "3.15.0"