From bf8c59cd896b1bf98d0f3df356531fa4c163219f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 9 Feb 2021 21:23:05 +0000 Subject: [PATCH] Preparing for 6.1.2 release --- Gemfile.lock | 110 +++++++++--------- 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 | 5 + actiontext/lib/action_text/gem_version.rb | 2 +- actiontext/package.json | 2 +- actionview/CHANGELOG.md | 5 + actionview/lib/action_view/gem_version.rb | 2 +- actionview/package.json | 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 | 30 +++++ 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 | 2 + .../lib/active_support/gem_version.rb | 2 +- guides/CHANGELOG.md | 5 + railties/CHANGELOG.md | 5 + railties/lib/rails/gem_version.rb | 2 +- version.rb | 2 +- 32 files changed, 157 insertions(+), 73 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7aa67a7fdfa89..4bda7eae2ea50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,83 +30,83 @@ GIT PATH remote: . specs: - actioncable (6.1.1) - actionpack (= 6.1.1) - activesupport (= 6.1.1) + actioncable (6.1.2) + actionpack (= 6.1.2) + activesupport (= 6.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.1) - actionpack (= 6.1.1) - activejob (= 6.1.1) - activerecord (= 6.1.1) - activestorage (= 6.1.1) - activesupport (= 6.1.1) + actionmailbox (6.1.2) + actionpack (= 6.1.2) + activejob (= 6.1.2) + activerecord (= 6.1.2) + activestorage (= 6.1.2) + activesupport (= 6.1.2) mail (>= 2.7.1) - actionmailer (6.1.1) - actionpack (= 6.1.1) - actionview (= 6.1.1) - activejob (= 6.1.1) - activesupport (= 6.1.1) + actionmailer (6.1.2) + actionpack (= 6.1.2) + actionview (= 6.1.2) + activejob (= 6.1.2) + activesupport (= 6.1.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.1) - actionview (= 6.1.1) - activesupport (= 6.1.1) + actionpack (6.1.2) + actionview (= 6.1.2) + activesupport (= 6.1.2) 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.1) - actionpack (= 6.1.1) - activerecord (= 6.1.1) - activestorage (= 6.1.1) - activesupport (= 6.1.1) + actiontext (6.1.2) + actionpack (= 6.1.2) + activerecord (= 6.1.2) + activestorage (= 6.1.2) + activesupport (= 6.1.2) nokogiri (>= 1.8.5) - actionview (6.1.1) - activesupport (= 6.1.1) + actionview (6.1.2) + activesupport (= 6.1.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.1) - activesupport (= 6.1.1) + activejob (6.1.2) + activesupport (= 6.1.2) globalid (>= 0.3.6) - activemodel (6.1.1) - activesupport (= 6.1.1) - activerecord (6.1.1) - activemodel (= 6.1.1) - activesupport (= 6.1.1) - activestorage (6.1.1) - actionpack (= 6.1.1) - activejob (= 6.1.1) - activerecord (= 6.1.1) - activesupport (= 6.1.1) + activemodel (6.1.2) + activesupport (= 6.1.2) + activerecord (6.1.2) + activemodel (= 6.1.2) + activesupport (= 6.1.2) + activestorage (6.1.2) + actionpack (= 6.1.2) + activejob (= 6.1.2) + activerecord (= 6.1.2) + activesupport (= 6.1.2) marcel (~> 0.3.1) mimemagic (~> 0.3.2) - activesupport (6.1.1) + activesupport (6.1.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - rails (6.1.1) - actioncable (= 6.1.1) - actionmailbox (= 6.1.1) - actionmailer (= 6.1.1) - actionpack (= 6.1.1) - actiontext (= 6.1.1) - actionview (= 6.1.1) - activejob (= 6.1.1) - activemodel (= 6.1.1) - activerecord (= 6.1.1) - activestorage (= 6.1.1) - activesupport (= 6.1.1) + rails (6.1.2) + actioncable (= 6.1.2) + actionmailbox (= 6.1.2) + actionmailer (= 6.1.2) + actionpack (= 6.1.2) + actiontext (= 6.1.2) + actionview (= 6.1.2) + activejob (= 6.1.2) + activemodel (= 6.1.2) + activerecord (= 6.1.2) + activestorage (= 6.1.2) + activesupport (= 6.1.2) bundler (>= 1.15.0) - railties (= 6.1.1) + railties (= 6.1.2) sprockets-rails (>= 2.0.0) - railties (6.1.1) - actionpack (= 6.1.1) - activesupport (= 6.1.1) + railties (6.1.2) + actionpack (= 6.1.2) + activesupport (= 6.1.2) method_source rake (>= 0.8.7) thor (~> 1.0) @@ -292,7 +292,7 @@ GEM hiredis (0.6.3-java) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.8) concurrent-ruby (~> 1.0) image_processing (1.10.2) mini_magick (>= 4.9.5, < 5) @@ -311,7 +311,7 @@ GEM listen (3.3.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.8.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) diff --git a/RAILS_VERSION b/RAILS_VERSION index f3b5af39e430e..5e3254243a3b2 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -6.1.1 +6.1.2 diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md index 7bcce6c5249a5..f8b22e168eb92 100644 --- a/actioncable/CHANGELOG.md +++ b/actioncable/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * No changes. diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb index 3f87b737bf6d5..935c1f41787b9 100644 --- a/actioncable/lib/action_cable/gem_version.rb +++ b/actioncable/lib/action_cable/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actioncable/package.json b/actioncable/package.json index 87e7cf59b422b..c871d5f171dc7 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actioncable", - "version": "6.1.1", + "version": "6.1.2", "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 cad5208c59fb5..0c661c6044a60 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * No changes. diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb index e279caae87087..9b0efedd3b70b 100644 --- a/actionmailbox/lib/action_mailbox/gem_version.rb +++ b/actionmailbox/lib/action_mailbox/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 3661b88bb7848..2e8922d2208ca 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * Sets default mailer queue to `"default"` in the mail assertions. diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index ac7a1a7a7da32..19f44b5e594d9 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index a57d40eb69c5e..22cc5f12c169d 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.2 (February 09, 2021) ## + * Fix error in `ActionController::LogSubscriber` that would happen when throwing inside a controller action. *Janko Marohnić* diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index 94f00d6f5e698..5dce2c712e561 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index f43695605ee74..69ad19a0df014 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * No changes. diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb index d39cee6533aa3..74b7c314dbf28 100644 --- a/actiontext/lib/action_text/gem_version.rb +++ b/actiontext/lib/action_text/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actiontext/package.json b/actiontext/package.json index 5b5305984b3de..5ba843e3f1915 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actiontext", - "version": "6.1.1", + "version": "6.1.2", "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 78bc3ff125351..9e8eeb5ef21a2 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * Fix lazy translation in partial with block. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index a4047050169b5..951031792252b 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/actionview/package.json b/actionview/package.json index cdd9a4c1db293..4bcd0ff7b2fae 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -1,6 +1,6 @@ { "name": "@rails/ujs", - "version": "6.1.1", + "version": "6.1.2", "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 6bf16f875e810..8c2d415adf009 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * Make `retry_job` return the job that was created. diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index 59d5c26a2cbce..33382a8ff5dbf 100644 --- a/activejob/lib/active_job/gem_version.rb +++ b/activejob/lib/active_job/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index fb4aba827d6eb..d9f7ad09e6c6d 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * No changes. diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index f8bbd6b3f9352..ec94c02f12c6b 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 5d6059a08420a..43fcc2a50a6fa 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,9 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* Fix timestamp type for sqlite3. + + *Eileen M. Uchitelle* + * Make destroy async transactional. An active record rollback could occur while enqueuing a job. In this @@ -8,6 +14,10 @@ *Cory Gwin* +* Fix malformed packet error in MySQL statement for connection configuration. + + *robinroestenburg* + * Connection specification now passes the "url" key as a configuration for the adapter if the "url" protocol is "jdbc", "http", or "https". Previously only urls with the "jdbc" prefix were passed to the Active Record Adapter, others @@ -17,6 +27,26 @@ *Jonathan Bracy* +* Fix granular connection swapping when there are multiple abstract classes. + + *Eileen M. Uchitelle* + +* Fix `find_by` with custom primary key for belongs_to association. + + *Ryuta Kamizono* + +* Add support for `rails console --sandbox` for multiple database applications. + + *alpaca-tc* + +* Fix `where` on polymorphic association with empty array. + + *Ryuta Kamizono* + +* Fix preventing writes for `ApplicationRecord`. + + *Eileen M. Uchitelle* + ## Rails 6.1.1 (January 07, 2021) ## diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index b6f838cca5a4a..d45631f444c15 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index a24161aaac58e..68e958e304d86 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * Fix S3 multipart uploads when threshold is larger than file. diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb index e20125e682770..7933d4b1d91b7 100644 --- a/activestorage/lib/active_storage/gem_version.rb +++ b/activestorage/lib/active_storage/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/activestorage/package.json b/activestorage/package.json index 4b50618de7b99..cb83d4b83105e 100644 --- a/activestorage/package.json +++ b/activestorage/package.json @@ -1,6 +1,6 @@ { "name": "@rails/activestorage", - "version": "6.1.1", + "version": "6.1.2", "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 8ebfb4e393012..1f7efa6fca0a8 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.1.2 (February 09, 2021) ## + * `ActiveSupport::Cache::MemCacheStore` now accepts an explicit `nil` for its `addresses` argument. ```ruby diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index db1a53313c239..47a1a4219f22a 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index 4fdb29118d9d4..3e7a3803efbee 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 84575569801ec..eebb14bab97d6 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.1.2 (February 09, 2021) ## + +* No changes. + + ## Rails 6.1.1 (January 07, 2021) ## * Allow spaces in path to Yarn binstub and only run on precompile if needed. diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index 511862201b0e0..7ddb71ea7f18e 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/version.rb b/version.rb index 511862201b0e0..7ddb71ea7f18e 100644 --- a/version.rb +++ b/version.rb @@ -9,7 +9,7 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")