railties 4.1.6.rc1 → 4.1.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc8f12b305943d799437f2bd5c6a3dadd55ed2f
-  data.tar.gz: 9ea7cb5d9a06d5b2efb698d66f760487c33906f5
+  metadata.gz: d56459cbc0ef890cd09d07ba3e15d16f2210f7fd
+  data.tar.gz: cb39120653e2efcf503e01b56606a40cf8798baf
 SHA512:
-  metadata.gz: ec9e7dac2f1af356de76e78029d290929659639eaefe42a890a2548b916a083f30ff67e438af11ce0179646bfec5ec5fe475a326f2a88ee89e1896e65c574192
-  data.tar.gz: 8405199c8a6467fa2fd592b00db483b5eacb0860fd42fc5524decc3636d419c46e3c624b70e1d6df9ffe9b1e21bbcbbac2159ba0511ea1ae166ed9255d6616c6
+  metadata.gz: 44813d31da3cd8921c452020307c6b71fd9c538674732334753a8f47499afed974a0f0a1b3898cd28853ee690039be91f0dfad271640c224c480ecf124f4c447
+  data.tar.gz: ec39f969c9563cba893e860d2e33c15d11bf38476ee255eaca76a5acdfa5be92f1c90919c0ac7ca60492fd9f80ecc84af1de2801fa3f71852d4d0205ebb4be5f

data/CHANGELOG.md

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

data/lib/rails/application.rb

@@ -365,8 +365,14 @@ module Rails
       end
     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
@@ -399,11 +405,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
@@ -423,13 +424,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/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 4
     MINOR = 1
     TINY  = 6
-    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.1.6.rc1
+  version: 4.1.6.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.1.6.rc1
+        version: 4.1.6.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6.rc1
+        version: 4.1.6.rc2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6.rc1
+        version: 4.1.6.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6.rc1
+        version: 4.1.6.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6.rc1
+        version: 4.1.6.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6.rc1
+        version: 4.1.6.rc2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -354,7 +354,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.