From 5bda404fe1d7b5772560fdec99818b239d4b57aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 5 Nov 2015 01:00:09 -0200 Subject: [PATCH] Preparing for 4.2.5.rc2 release --- Gemfile.lock | 58 +++++++++---------- RAILS_VERSION | 2 +- actionmailer/CHANGELOG.md | 5 ++ actionmailer/lib/action_mailer/gem_version.rb | 2 +- actionpack/CHANGELOG.md | 5 ++ actionpack/lib/action_pack/gem_version.rb | 2 +- actionview/CHANGELOG.md | 7 +++ 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 | 2 + activerecord/lib/active_record/gem_version.rb | 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 +- version.rb | 2 +- 20 files changed, 83 insertions(+), 39 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2472204803736..b5599a8e552c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,55 +14,55 @@ GIT PATH remote: . specs: - actionmailer (4.2.5.rc1) - actionpack (= 4.2.5.rc1) - actionview (= 4.2.5.rc1) - activejob (= 4.2.5.rc1) + actionmailer (4.2.5.rc2) + actionpack (= 4.2.5.rc2) + actionview (= 4.2.5.rc2) + activejob (= 4.2.5.rc2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.rc1) - actionview (= 4.2.5.rc1) - activesupport (= 4.2.5.rc1) + actionpack (4.2.5.rc2) + actionview (= 4.2.5.rc2) + activesupport (= 4.2.5.rc2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.rc1) - activesupport (= 4.2.5.rc1) + actionview (4.2.5.rc2) + activesupport (= 4.2.5.rc2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5.rc1) - activesupport (= 4.2.5.rc1) + activejob (4.2.5.rc2) + activesupport (= 4.2.5.rc2) globalid (>= 0.3.0) - activemodel (4.2.5.rc1) - activesupport (= 4.2.5.rc1) + activemodel (4.2.5.rc2) + activesupport (= 4.2.5.rc2) builder (~> 3.1) - activerecord (4.2.5.rc1) - activemodel (= 4.2.5.rc1) - activesupport (= 4.2.5.rc1) + activerecord (4.2.5.rc2) + activemodel (= 4.2.5.rc2) + activesupport (= 4.2.5.rc2) arel (~> 6.0) - activesupport (4.2.5.rc1) + activesupport (4.2.5.rc2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - rails (4.2.5.rc1) - actionmailer (= 4.2.5.rc1) - actionpack (= 4.2.5.rc1) - actionview (= 4.2.5.rc1) - activejob (= 4.2.5.rc1) - activemodel (= 4.2.5.rc1) - activerecord (= 4.2.5.rc1) - activesupport (= 4.2.5.rc1) + rails (4.2.5.rc2) + actionmailer (= 4.2.5.rc2) + actionpack (= 4.2.5.rc2) + actionview (= 4.2.5.rc2) + activejob (= 4.2.5.rc2) + activemodel (= 4.2.5.rc2) + activerecord (= 4.2.5.rc2) + activesupport (= 4.2.5.rc2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.rc1) + railties (= 4.2.5.rc2) sprockets-rails - railties (4.2.5.rc1) - actionpack (= 4.2.5.rc1) - activesupport (= 4.2.5.rc1) + railties (4.2.5.rc2) + actionpack (= 4.2.5.rc2) + activesupport (= 4.2.5.rc2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) diff --git a/RAILS_VERSION b/RAILS_VERSION index 80caed9128b2c..f8bf8e38de2ae 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -4.2.5.rc1 +4.2.5.rc2 diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 751ff182331de..a0fb9633c2053 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * No changes. diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index fe461554665ad..52a8e3ac73257 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 887d0441d3526..041ee9c8cbe78 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * `ActionController::TestCase` can teardown gracefully if an error is raised diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index 6b5ea15073e92..0cc157e2d16c0 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index bf0e9b7f8b99d..0eff811804f2e 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,10 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* Fix `mail_to` when called with `nil` as argument. + + *Rafael Mendonça França* + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * `url_for` does not modify its arguments when generating polymorphic URLs. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index 013edecc5bab6..39d4d42493e36 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index 6d88715f2b2fd..7615a6dd8a664 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * No changes. diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb index acb61924b3d2b..3e2b5f852270f 100644 --- a/activejob/lib/active_job/gem_version.rb +++ b/activejob/lib/active_job/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 4e7b24e9ddc0a..b130e8deb3c4e 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * No changes. diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index ad76b9181a0d1..2092c12593a83 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index d89d988531b0a..ff34ded53ca44 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,5 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + * No longer pass deprecated option `-i` to `pg_dump`. *Paul Sadauskas* diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index bca4d9b0da97a..f4daf3ec2aeca 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 7570ba75fc81b..18d23aef8761b 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * Fix `TimeWithZone#eql?` to properly handle `TimeWithZone` created from `DateTime`: diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index 13d76fdb7703a..79a326ebea5a2 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index f9f975f01ab2e..8854f2b8e458a 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 2f43d70b6c124..05fcfd26857da 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 4.2.5.rc2 (November 05, 2015) ## + +* No changes. + + ## Rails 4.2.5.rc1 (October 30, 2015) ## * Fix displaying mailer previews on non local requests when config diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index 5a07c3efbaa34..bc677ad50320a 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index 5a07c3efbaa34..bc677ad50320a 100644 --- a/version.rb +++ b/version.rb @@ -8,7 +8,7 @@ module VERSION MAJOR = 4 MINOR = 2 TINY = 5 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end