diff options
| author | Arun Agrawal <arunagw@gmail.com> | 2014-05-23 14:34:05 +0200 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2014-05-27 16:12:36 +0200 |
| commit | 50de394cc863acac9400e955cb93ed81b45e9eac (patch) | |
| tree | c71c24462442de63e3f1427c68c2a4a2845cb62f /railties/lib/rails | |
| parent | 0cc7f02b890d33a4e3d2a7e09f66781745e33820 (diff) | |
| download | rails-50de394cc863acac9400e955cb93ed81b45e9eac.tar.gz rails-50de394cc863acac9400e955cb93ed81b45e9eac.tar.bz2 rails-50de394cc863acac9400e955cb93ed81b45e9eac.zip | |
rake railties:install:migrations respects the order of railties
This PR fixes #8930 and some stuff from #8985
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 9 |
1 files changed, 9 insertions, 0 deletions
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 |