Merge branch '5-0-4' into 5-0-stable

Gemfile.lock

@@ -9,58 +9,58 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (5.0.4.rc1)
-      actionpack (= 5.0.4.rc1)
+    actioncable (5.0.4)
+      actionpack (= 5.0.4)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.4.rc1)
-      actionpack (= 5.0.4.rc1)
-      actionview (= 5.0.4.rc1)
-      activejob (= 5.0.4.rc1)
+    actionmailer (5.0.4)
+      actionpack (= 5.0.4)
+      actionview (= 5.0.4)
+      activejob (= 5.0.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.4.rc1)
-      actionview (= 5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    actionpack (5.0.4)
+      actionview (= 5.0.4)
+      activesupport (= 5.0.4)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    actionview (5.0.4)
+      activesupport (= 5.0.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    activejob (5.0.4)
+      activesupport (= 5.0.4)
       globalid (>= 0.3.6)
-    activemodel (5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
-    activerecord (5.0.4.rc1)
-      activemodel (= 5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    activemodel (5.0.4)
+      activesupport (= 5.0.4)
+    activerecord (5.0.4)
+      activemodel (= 5.0.4)
+      activesupport (= 5.0.4)
       arel (~> 7.0)
-    activesupport (5.0.4.rc1)
+    activesupport (5.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.0.4.rc1)
-      actioncable (= 5.0.4.rc1)
-      actionmailer (= 5.0.4.rc1)
-      actionpack (= 5.0.4.rc1)
-      actionview (= 5.0.4.rc1)
-      activejob (= 5.0.4.rc1)
-      activemodel (= 5.0.4.rc1)
-      activerecord (= 5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    rails (5.0.4)
+      actioncable (= 5.0.4)
+      actionmailer (= 5.0.4)
+      actionpack (= 5.0.4)
+      actionview (= 5.0.4)
+      activejob (= 5.0.4)
+      activemodel (= 5.0.4)
+      activerecord (= 5.0.4)
+      activesupport (= 5.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.4.rc1)
+      railties (= 5.0.4)
       sprockets-rails (>= 2.0.0)
-    railties (5.0.4.rc1)
-      actionpack (= 5.0.4.rc1)
-      activesupport (= 5.0.4.rc1)
+    railties (5.0.4)
+      actionpack (= 5.0.4)
+      activesupport (= 5.0.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

RAILS_VERSION

-5.0.4.rc1
+5.0.4

actioncable/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

actioncable/lib/action_cable/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

actioncable/package.json

 {
   "name": "actioncable",
-  "version": "5.0.4-rc1",
+  "version": "5.0.4",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "lib/assets/compiled/action_cable.js",
   "files": [

actionmailer/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

actionmailer/lib/action_mailer/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

actionpack/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

actionpack/lib/action_pack/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

actionview/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

actionview/lib/action_view/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activejob/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

activejob/lib/active_job/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activemodel/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   Fix regression in numericality validator when comparing Decimal and Float input 
     values with more scale than the schema.

activemodel/lib/active_model/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activerecord/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   Restore previous behavior of collection proxies: their values can have
     methods stubbed, and they respect extension modules applied by a default

activerecord/lib/active_record/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

activesupport/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

activesupport/lib/active_support/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

guides/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

railties/CHANGELOG.md

-## Rails 5.0.4.rc1 (June 14, 2017) ##
+## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.
 

railties/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

version.rb

@@ -8,7 +8,7 @@ module VERSION
     MAJOR = 5
     MINOR = 0
     TINY  = 4
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end