diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-16 13:56:59 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-16 13:56:59 -0700 |
| commit | a788d4e6e9c2dd40db4d3bebf40703da6deeb6e7 (patch) | |
| tree | 53691bdc52d7ca3d04de7ae60a1700f95874602b /railties/lib/rails | |
| parent | be99ae78c9c4b52541297f0fb146701070041c02 (diff) | |
| parent | 29dfe05e075c3369c1182ba1ff0ba92755287d3c (diff) | |
| download | rails-a788d4e6e9c2dd40db4d3bebf40703da6deeb6e7.tar.gz rails-a788d4e6e9c2dd40db4d3bebf40703da6deeb6e7.tar.bz2 rails-a788d4e6e9c2dd40db4d3bebf40703da6deeb6e7.zip | |
Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patch
Patch for [3.1.0.rc1] App plugins initialized before engines and plugins inside engines
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/railties.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/railties.rb b/railties/lib/rails/application/railties.rb index 4fc5e92837..8f3a3e8bbb 100644 --- a/railties/lib/rails/application/railties.rb +++ b/railties/lib/rails/application/railties.rb @@ -4,7 +4,7 @@ module Rails class Application < Engine class Railties < Rails::Engine::Railties def all(&block) - @all ||= railties + engines + super + @all ||= railties + engines + plugins @all.each(&block) if block @all end |