From 50de394cc863acac9400e955cb93ed81b45e9eac Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Fri, 23 May 2014 14:34:05 +0200 Subject: rake railties:install:migrations respects the order of railties This PR fixes #8930 and some stuff from #8985 --- railties/lib/rails/application.rb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'railties/lib') diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 2fde974732..362713eb75 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -364,6 +364,10 @@ module Rails end end + def migration_railties # :nodoc: + (ordered_railties & railties_without_main_app).reverse + end + protected alias :build_middleware_stack :app @@ -394,6 +398,11 @@ 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 -- cgit v1.2.3