Merge branch '4-1-16' into 4-1-stable

rails · Jul 13, 2016 · 0cad778 · 0cad778
2 parents 871d63e + d880330
commit 0cad778
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 42 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    actionmailer (4.1.16.rc1)
-      actionpack (= 4.1.16.rc1)
-      actionview (= 4.1.16.rc1)
+    actionmailer (4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.16.rc1)
-      actionview (= 4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    actionpack (4.1.16)
+      actionview (= 4.1.16)
+      activesupport (= 4.1.16)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    actionview (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
-    activerecord (4.1.16.rc1)
-      activemodel (= 4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
       arel (~> 5.0.0)
-    activesupport (4.1.16.rc1)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    rails (4.1.16.rc1)
-      actionmailer (= 4.1.16.rc1)
-      actionpack (= 4.1.16.rc1)
-      actionview (= 4.1.16.rc1)
-      activemodel (= 4.1.16.rc1)
-      activerecord (= 4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    rails (4.1.16)
+      actionmailer (= 4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      activemodel (= 4.1.16)
+      activerecord (= 4.1.16)
+      activesupport (= 4.1.16)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.16.rc1)
+      railties (= 4.1.16)
       sprockets-rails (~> 2.0)
-    railties (4.1.16.rc1)
-      actionpack (= 4.1.16.rc1)
-      activesupport (= 4.1.16.rc1)
+    railties (4.1.16)
+      actionpack (= 4.1.16)
+      activesupport (= 4.1.16)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
 

diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-4.1.16.rc1
+4.1.16
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   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 = 1
     TINY  = 16
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   No changes.
 

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

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   No changes.
 

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

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   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 = 1
     TINY  = 16
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   Correctly pass MySQL options when using structure_dump or structure_load
 

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

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   No changes.
 

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

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   No changes.
 

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.1.16.rc1 (July 01, 2016) ##
+## Rails 4.1.16 (July 12, 2016) ##
 
 *   Do not run `bundle install` when generating a new plugin.
 

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