From 53410537594be0c0a528cff53dce433dd386cb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 10 Mar 2022 21:06:25 +0000 Subject: [PATCH] Preparing for 6.1.5 release --- Gemfile.lock | 135 ++++++++++-------- RAILS_VERSION | 2 +- actioncable/CHANGELOG.md | 2 + actioncable/lib/action_cable/gem_version.rb | 4 +- actioncable/package.json | 2 +- actionmailbox/CHANGELOG.md | 2 + .../lib/action_mailbox/gem_version.rb | 4 +- actionmailer/CHANGELOG.md | 5 + actionmailer/lib/action_mailer/gem_version.rb | 4 +- actionpack/CHANGELOG.md | 2 + actionpack/lib/action_pack/gem_version.rb | 4 +- actiontext/CHANGELOG.md | 2 + actiontext/lib/action_text/gem_version.rb | 4 +- actiontext/package.json | 2 +- actionview/CHANGELOG.md | 2 + actionview/lib/action_view/gem_version.rb | 4 +- actionview/package.json | 2 +- activejob/CHANGELOG.md | 5 + activejob/lib/active_job/gem_version.rb | 4 +- activemodel/CHANGELOG.md | 2 + activemodel/lib/active_model/gem_version.rb | 4 +- activerecord/CHANGELOG.md | 2 + activerecord/lib/active_record/gem_version.rb | 4 +- activestorage/CHANGELOG.md | 2 + .../lib/active_storage/gem_version.rb | 4 +- activestorage/package.json | 2 +- activesupport/CHANGELOG.md | 2 + .../lib/active_support/gem_version.rb | 4 +- guides/CHANGELOG.md | 5 + railties/CHANGELOG.md | 2 + railties/lib/rails/gem_version.rb | 4 +- version.rb | 4 +- 32 files changed, 145 insertions(+), 87 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8fb1fb85afe95..b4ad05e6b6aa4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,83 +30,83 @@ GIT PATH remote: . specs: - actioncable (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + actioncable (6.1.5) + actionpack (= 6.1.5) + activesupport (= 6.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.7) - actionpack (= 6.1.4.7) - activejob (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailbox (6.1.5) + actionpack (= 6.1.5) + activejob (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) mail (>= 2.7.1) - actionmailer (6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailer (6.1.5) + actionpack (= 6.1.5) + actionview (= 6.1.5) + activejob (= 6.1.5) + activesupport (= 6.1.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionpack (6.1.5) + actionview (= 6.1.5) + activesupport (= 6.1.5) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.7) - actionpack (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + actiontext (6.1.5) + actionpack (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) nokogiri (>= 1.8.5) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (6.1.5) + activesupport (= 6.1.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.7) - activesupport (= 6.1.4.7) + activejob (6.1.5) + activesupport (= 6.1.5) globalid (>= 0.3.6) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activestorage (6.1.4.7) - actionpack (= 6.1.4.7) - activejob (= 6.1.4.7) - activerecord (= 6.1.4.7) - activesupport (= 6.1.4.7) + activemodel (6.1.5) + activesupport (= 6.1.5) + activerecord (6.1.5) + activemodel (= 6.1.5) + activesupport (= 6.1.5) + activestorage (6.1.5) + actionpack (= 6.1.5) + activejob (= 6.1.5) + activerecord (= 6.1.5) + activesupport (= 6.1.5) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.7) + activesupport (6.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - rails (6.1.4.7) - actioncable (= 6.1.4.7) - actionmailbox (= 6.1.4.7) - actionmailer (= 6.1.4.7) - actionpack (= 6.1.4.7) - actiontext (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activemodel (= 6.1.4.7) - activerecord (= 6.1.4.7) - activestorage (= 6.1.4.7) - activesupport (= 6.1.4.7) + rails (6.1.5) + actioncable (= 6.1.5) + actionmailbox (= 6.1.5) + actionmailer (= 6.1.5) + actionpack (= 6.1.5) + actiontext (= 6.1.5) + actionview (= 6.1.5) + activejob (= 6.1.5) + activemodel (= 6.1.5) + activerecord (= 6.1.5) + activestorage (= 6.1.5) + activesupport (= 6.1.5) bundler (>= 1.15.0) - railties (= 6.1.4.7) + railties (= 6.1.5) sprockets-rails (>= 2.0.0) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + railties (6.1.5) + actionpack (= 6.1.5) + activesupport (= 6.1.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -205,6 +205,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) + digest (3.1.0) digest-crc (0.6.3) rake (>= 12.0.0, < 14.0.0) em-http-request (1.1.7) @@ -288,11 +289,12 @@ 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) ruby-vips (>= 2.0.17, < 3) + io-wait (0.2.1) jmespath (1.4.0) json (2.5.1) jwt (2.2.3) @@ -309,6 +311,7 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) + matrix (0.4.2) memoist (0.16.2) method_source (1.0.0) mini_magick (4.11.0) @@ -336,12 +339,25 @@ GEM ruby2_keywords (~> 0.0.1) net-http-persistent (4.0.1) connection_pool (~> 2.2) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.7) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) - nokogiri (1.11.3-x86_64-darwin) - racc (~> 1.4) os (1.1.1) parallel (1.20.1) parser (3.0.1.1) @@ -475,6 +491,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) stackprof (0.2.17) + strscan (3.0.1) sucker_punch (3.0.1) concurrent-ruby (~> 1.0) thin (1.8.0) @@ -483,6 +500,7 @@ GEM rack (>= 1, < 3) thor (1.1.0) tilt (2.0.10) + timeout (0.2.0) trailblazer-option (0.1.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -545,6 +563,7 @@ DEPENDENCIES dalli delayed_job delayed_job_active_record + digest (~> 3.1.0.pre) google-cloud-storage (~> 1.11) hiredis image_processing (~> 1.2) @@ -552,11 +571,15 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (~> 3.3) + matrix minitest (>= 5.15.0) minitest-bisect minitest-reporters minitest-retry mysql2 (~> 0.5)! + net-imap + net-pop + net-smtp nokogiri (>= 1.8.1) pg (>= 1.3.0.rc1) psych (~> 3.0) diff --git a/RAILS_VERSION b/RAILS_VERSION index 67beaee6ce25b..7d28a3c4d7aa7 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -6.1.4.7 +6.1.5 diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md index a94b8454761df..1af6bf64fc47d 100644 --- a/actioncable/CHANGELOG.md +++ b/actioncable/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * The Action Cable client now ensures successful channel subscriptions: * The client maintains a set of pending subscriptions until either diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb index 83ceb47fac32d..fd5f5d547a5f8 100644 --- a/actioncable/lib/action_cable/gem_version.rb +++ b/actioncable/lib/action_cable/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actioncable/package.json b/actioncable/package.json index ac8e64915cb95..be77aae063da7 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actioncable", - "version": "6.1.4-7", + "version": "6.1.5", "description": "WebSocket framework for Ruby on Rails.", "main": "app/assets/javascripts/action_cable.js", "files": [ diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md index 477cf5e2f95b1..874bb59244799 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Add `attachments` to the list of permitted parameters for inbound emails conductor. When using the conductor to test inbound emails with attachments, this prevents an diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb index 46c76968c4b3e..1096eae500d44 100644 --- a/actionmailbox/lib/action_mailbox/gem_version.rb +++ b/actionmailbox/lib/action_mailbox/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index b640e54dce131..2218ed14ef14b 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.5 (March 09, 2022) ## + +* No changes. + + ## Rails 6.1.4.7 (March 08, 2022) ## * No changes. diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index 8ecc9e13513dd..6be8766831769 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index bdd089bd86122..687cea8652597 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Fix `content_security_policy` returning invalid directives. Directives such as `self`, `unsafe-eval` and few others were not diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index 66acc53385b71..5d5d2a24b9e5d 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index 2de923568df10..411484ffb1b08 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Fix Action Text extra trix content wrapper. *Alexandre Ruban* diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb index 60d0bef45c37a..a147bd724543c 100644 --- a/actiontext/lib/action_text/gem_version.rb +++ b/actiontext/lib/action_text/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/package.json b/actiontext/package.json index 5d690dfcc2d8f..a2cbaee60ab07 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actiontext", - "version": "6.1.4-7", + "version": "6.1.5", "description": "Edit and display rich text in Rails applications", "main": "app/javascript/actiontext/index.js", "files": [ diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index ebeed2390eb9d..853729205554f 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * `preload_link_tag` properly inserts `as` attributes for files with `image` MIME types, such as JPG or SVG. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index 40ae5b587dee9..4ddf00da52c8b 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionview/package.json b/actionview/package.json index ab382da80a623..b69a549b6ded4 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -1,6 +1,6 @@ { "name": "@rails/ujs", - "version": "6.1.4-7", + "version": "6.1.5", "description": "Ruby on Rails unobtrusive scripting adapter", "main": "lib/assets/compiled/rails-ujs.js", "files": [ diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index 380d53b8fa022..be98df88ccc33 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.5 (March 09, 2022) ## + +* No changes. + + ## Rails 6.1.4.7 (March 08, 2022) ## * No changes. diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index a5ced54c67849..a5e9de97cad3d 100644 --- a/activejob/lib/active_job/gem_version.rb +++ b/activejob/lib/active_job/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 375f09ff65d99..0d1c7f8ce095c 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Clear secure password cache if password is set to `nil` Before: diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index 0d53e031b1e54..7570c9c2e212f 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 26312f745f85d..f5f86bcd38009 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Fix `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` for Ruby 2.6. Ruby 2.6 and 2.7 have slightly different implementations of the `String#@-` method. diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index 2be33df9bc637..9c988ac19e12d 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 299d7772af4c5..749c6416ff5eb 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Attachments can be deleted after their association is no longer defined. Fixes #42514 diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb index 635a9019f07c3..dca63a8f60128 100644 --- a/activestorage/lib/active_storage/gem_version.rb +++ b/activestorage/lib/active_storage/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/package.json b/activestorage/package.json index b09a23770d467..d6ae6cbca013c 100644 --- a/activestorage/package.json +++ b/activestorage/package.json @@ -1,6 +1,6 @@ { "name": "@rails/activestorage", - "version": "6.1.4-7", + "version": "6.1.5", "description": "Attach cloud and local files in Rails applications", "main": "app/assets/javascripts/activestorage.js", "files": [ diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 0966c5aa35fad..95b9464f69baf 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * Fix `ActiveSupport::Duration.build` to support negative values. The algorithm to collect the `parts` of the `ActiveSupport::Duration` diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index 025468283cc06..562716b8abe5b 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index d3954c098ac17..c82974588e2b5 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.5 (March 09, 2022) ## + +* No changes. + + ## Rails 6.1.4.7 (March 08, 2022) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 4dfe1e477f656..7c73f06ae288b 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.5 (March 09, 2022) ## + * In `zeitwerk` mode, setup the `once` autoloader first, and the `main` autoloader after it. This order plays better with shared namespaces. diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index c2673143a5d8d..709631bbe847a 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index c2673143a5d8d..709631bbe847a 100644 --- a/version.rb +++ b/version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 4 - PRE = "7" + TINY = 5 + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end