railties 4.0.10.rc1 → 4.0.10.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80050aab11ab93b6d0c7a171a35143069471178
-  data.tar.gz: 662b22a8fbacffc02588762a1fbb592f069e10b6
+  metadata.gz: e0234dfd0fee5f1a9bb3fd91b187d16e44044e01
+  data.tar.gz: 672ba687112e5021f5426496dbcca62dc91639a1
 SHA512:
-  metadata.gz: 42da06cf0fc6f9f2a6f7ed6846b8caff9a4d440619318f93118ea10b5632a2db7c6134411fbb1780b374a65ac4b613cb92ef72b7f1dbf00cd72a6b1cff4f17cb
-  data.tar.gz: e52292c1c9a5aa48d6f569ac8680ab00cd6587b80be62b5ababf0750612a5e1ad734a522fb65b7ae296e6369863b30a7724b02f9c9994e825b3d5fa6844a9c75
+  metadata.gz: 480263ab13a409c59c6accac9d83759f5aad24edbd8c7a3a6f468c9d732dc754d1b345021f2fe6db9c750ada8f6f41c25552738daea576baf6c94d3aa0bcc0f1
+  data.tar.gz: bc9f09099889d61133aec373d475280a42caaf7122fc0358b93adbb0e5da86e739b6e62765b31584f17f035d98c56b4d434ab8463b66725ff2fffa122ca26b23

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.0.10 (August 19, 2014) ##
+## Rails 4.0.10 (September 8, 2014) ##
 
 *   Scaffold generator `_form` partial adds `class="field"` for password
     confirmation fields.

data/lib/rails/application.rb

@@ -235,8 +235,14 @@ module Rails
       config.helpers_paths
     end
 
+    # Return an array of railties respecting the order they're loaded
+    # and the order specified by the +railties_order+ config.
+    #
+    # While when running initializers we need engines in reverse
+    # order here when copying migrations from railties we need then in the same
+    # order as given by +railties_order+
     def migration_railties # :nodoc:
-      (ordered_railties & railties_without_main_app).reverse
+      ordered_railties.flatten - [self]
     end
 
   protected
@@ -270,11 +276,6 @@ module Rails
       super
     end
 
-    def railties_without_main_app # :nodoc:
-      @railties_without_main_app ||= Rails::Railtie.subclasses.map(&:instance) +
-        Rails::Engine.subclasses.map(&:instance)
-    end
-
     # Returns the ordered railties for this application considering railties_order.
     def ordered_railties #:nodoc:
       @ordered_railties ||= begin
@@ -294,13 +295,13 @@ module Rails
 
         index = order.index(:all)
         order[index] = all
-        order.reverse.flatten
+        order
       end
     end
 
     def railties_initializers(current) #:nodoc:
       initializers = []
-      ordered_railties.each do |r|
+      ordered_railties.reverse.flatten.each do |r|
         if r == self
           initializers += current
         else

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 4
     MINOR = 0
     TINY  = 10
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.0.10.rc1
+  version: 4.0.10.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.10.rc1
+        version: 4.0.10.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.