Preparing for 4.2.5 release

rails · Nov 12, 2015 · 73521d5 · 73521d5
1 parent 739112e
commit 73521d5
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 89 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,55 +14,55 @@ GIT
 PATH
   remote: .
   specs:
-    actionmailer (4.2.5.rc2)
-      actionpack (= 4.2.5.rc2)
-      actionview (= 4.2.5.rc2)
-      activejob (= 4.2.5.rc2)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.rc2)
-      actionview (= 4.2.5.rc2)
-      activesupport (= 4.2.5.rc2)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
       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.rc2)
-      activesupport (= 4.2.5.rc2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       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.rc2)
-      activesupport (= 4.2.5.rc2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.rc2)
-      activesupport (= 4.2.5.rc2)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.5.rc2)
-      activemodel (= 4.2.5.rc2)
-      activesupport (= 4.2.5.rc2)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.5.rc2)
+    activesupport (4.2.5)
       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.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)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.rc2)
+      railties (= 4.2.5)
       sprockets-rails
-    railties (4.2.5.rc2)
-      actionpack (= 4.2.5.rc2)
-      activesupport (= 4.2.5.rc2)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
 

diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-4.2.5.rc2
+4.2.5
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   No changes.
 

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   `ActionController::TestCase` can teardown gracefully if an error is raised
     early in the `setup` chain.

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,12 +1,9 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
+## Rails 4.2.5 (November 12, 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.
 
     *Bernerd Schaefer*

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   No changes.
 
@@ -17,6 +12,7 @@
 
     *Johannes Opper*
 
+
 ## Rails 4.2.3 (June 25, 2015) ##
 
 *   `assert_enqueued_jobs` and `assert_performed_jobs` in block form use the

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   No changes.
 

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,12 +1,9 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   No longer pass deprecated option `-i` to `pg_dump`.
 
     *Paul Sadauskas*
 
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
-
 *   Set `scope.reordering_value` to `true` if :reordering values are specified.
 
     Fixes #21886.

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   Fix `TimeWithZone#eql?` to properly handle `TimeWithZone` created from `DateTime`:
         twz = DateTime.now.in_time_zone

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   No changes.
 

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Rails 4.2.5.rc2 (November 05, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.2.5.rc1 (October 30, 2015) ##
+## Rails 4.2.5 (November 12, 2015) ##
 
 *   Fix displaying mailer previews on non local requests when config
     `action_mailer.show_previews` is set

diff --git 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   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/version.rb b/version.rb
@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 4
     MINOR = 2
     TINY  = 5
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end