diff --git a/Gemfile.lock b/Gemfile.lock index 24ef14fba78c0..4c551a18a8713 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,79 +17,79 @@ GIT PATH remote: . specs: - actioncable (6.0.1) - actionpack (= 6.0.1) + actioncable (6.0.2.rc1) + actionpack (= 6.0.2.rc1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actionmailbox (6.0.2.rc1) + actionpack (= 6.0.2.rc1) + activejob (= 6.0.2.rc1) + activerecord (= 6.0.2.rc1) + activestorage (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) mail (>= 2.7.1) - actionmailer (6.0.1) - actionpack (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) + actionmailer (6.0.2.rc1) + actionpack (= 6.0.2.rc1) + actionview (= 6.0.2.rc1) + activejob (= 6.0.2.rc1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.1) - actionview (= 6.0.1) - activesupport (= 6.0.1) + actionpack (6.0.2.rc1) + actionview (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.1) - actionpack (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actiontext (6.0.2.rc1) + actionpack (= 6.0.2.rc1) + activerecord (= 6.0.2.rc1) + activestorage (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) nokogiri (>= 1.8.5) - actionview (6.0.1) - activesupport (= 6.0.1) + actionview (6.0.2.rc1) + activesupport (= 6.0.2.rc1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.1) - activesupport (= 6.0.1) + activejob (6.0.2.rc1) + activesupport (= 6.0.2.rc1) globalid (>= 0.3.6) - activemodel (6.0.1) - activesupport (= 6.0.1) - activerecord (6.0.1) - activemodel (= 6.0.1) - activesupport (= 6.0.1) - activestorage (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) + activemodel (6.0.2.rc1) + activesupport (= 6.0.2.rc1) + activerecord (6.0.2.rc1) + activemodel (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) + activestorage (6.0.2.rc1) + actionpack (= 6.0.2.rc1) + activejob (= 6.0.2.rc1) + activerecord (= 6.0.2.rc1) marcel (~> 0.3.1) - activesupport (6.0.1) + activesupport (6.0.2.rc1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2) - rails (6.0.1) - actioncable (= 6.0.1) - actionmailbox (= 6.0.1) - actionmailer (= 6.0.1) - actionpack (= 6.0.1) - actiontext (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) - activemodel (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + rails (6.0.2.rc1) + actioncable (= 6.0.2.rc1) + actionmailbox (= 6.0.2.rc1) + actionmailer (= 6.0.2.rc1) + actionpack (= 6.0.2.rc1) + actiontext (= 6.0.2.rc1) + actionview (= 6.0.2.rc1) + activejob (= 6.0.2.rc1) + activemodel (= 6.0.2.rc1) + activerecord (= 6.0.2.rc1) + activestorage (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) bundler (>= 1.3.0) - railties (= 6.0.1) + railties (= 6.0.2.rc1) sprockets-rails (>= 2.0.0) - railties (6.0.1) - actionpack (= 6.0.1) - activesupport (= 6.0.1) + railties (6.0.2.rc1) + actionpack (= 6.0.2.rc1) + activesupport (= 6.0.2.rc1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -518,8 +518,6 @@ GEM websocket (1.2.8) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-driver (0.7.1-java) - websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) diff --git a/RAILS_VERSION b/RAILS_VERSION index 5fe60723048a9..aef4e124eeda5 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -6.0.1 +6.0.2.rc1 diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md index 7c75b8f0be313..5095196a26c56 100644 --- a/actioncable/CHANGELOG.md +++ b/actioncable/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * No changes. diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb index 9c7153c7b6ba6..31c0060708117 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actioncable/package.json b/actioncable/package.json index 3bd24c84c546c..092a0fb25550e 100644 --- a/actioncable/package.json +++ b/actioncable/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actioncable", - "version": "6.0.1", + "version": "6.0.2-rc1", "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 e04880f69adc1..762ec4dbf216b 100644 --- a/actionmailbox/CHANGELOG.md +++ b/actionmailbox/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * No changes. diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb index 66837c389e66c..6ed0f845d7cc5 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 7d8181b93fc0c..7a6cdc54d4447 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Fix ActionMailer assertions don't work for parameterized mail with legacy delivery job. *bogdanvlviv* diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index 170fdade7c6c5..ad30a99f6909a 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index eea5f919571cf..1414e57cf58c7 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Allow using mountable engine route helpers in System Tests. *Chalo Fernandez* diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index e2361ce144641..c2ec299def4fd 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md index 673dc153efe3a..0151a34214cb6 100644 --- a/actiontext/CHANGELOG.md +++ b/actiontext/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * No changes. diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb index 5c976b4f7e7b6..8a7f2afdfb48a 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actiontext/package.json b/actiontext/package.json index 3c2b9bb3d5bb1..be98b5121e7d2 100644 --- a/actiontext/package.json +++ b/actiontext/package.json @@ -1,6 +1,6 @@ { "name": "@rails/actiontext", - "version": "6.0.1", + "version": "6.0.2-rc1", "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 24339ab710ae8..9ae2fcfae10e2 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * UJS avoids `Element.closest()` for IE 9 compatibility. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index a04932deb10b3..8a4f12c98480b 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionview/package.json b/actionview/package.json index 205100891daf6..530c055b60e34 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -1,6 +1,6 @@ { "name": "@rails/ujs", - "version": "6.0.1", + "version": "6.0.2-rc1", "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 a962279c0ecc1..07baebf91def0 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Allow Sidekiq access to the underlying job class. By having access to the Active Job class, Sidekiq can get access to any `sidekiq_options` which diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index 4bb34a77a0da2..69d2f16482a55 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index d69b1087fd5b1..5b0dde87f8c4b 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * No changes. diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index 58b1ef220c8fe..47d28046ce3f2 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 1fbfbd8823fba..0608c02b14b99 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Share the same connection pool for primary and replica databases in the transactional tests for the same database. diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index e0082172fa815..15541ea50d7a1 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 62dd2bf05bef8..b701d1152a678 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * `ActiveStorage::AnalyzeJob`s are discarded on `ActiveRecord::RecordNotFound` errors. diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb index 4273ec1967745..9e2ad405757d0 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activestorage/package.json b/activestorage/package.json index 4d98ac449996b..c83265c3dbb5d 100644 --- a/activestorage/package.json +++ b/activestorage/package.json @@ -1,6 +1,6 @@ { "name": "@rails/activestorage", - "version": "6.0.1", + "version": "6.0.2-rc1", "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 4572f3420dc83..2589256daeb90 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Eager load translations during initialization. *Diego Plentz* diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index 1736cc0ff8134..40f19c959e3b3 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index bb862e2e45995..f06efbce62fa4 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + +* No changes. + + ## Rails 6.0.1 (November 5, 2019) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 8f894d016d2b9..57a8db0c9ff07 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 6.0.2.rc1 (November 27, 2019) ## + * Fix the collision check for the scaffold generator. *Ryan Robeson* diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index 8986dbb66ac44..a75d43a79c4d5 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 = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index 8986dbb66ac44..a75d43a79c4d5 100644 --- a/version.rb +++ b/version.rb @@ -9,8 +9,8 @@ def self.gem_version module VERSION MAJOR = 6 MINOR = 0 - TINY = 1 - PRE = nil + TINY = 2 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end