diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-13 08:49:04 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-13 08:52:52 +0100 |
commit | 11aa167e239a85513d00a7910446bedf7b1f7800 (patch) | |
tree | 3e6471b5761f74e22fc58101160c239b68c7ffd3 /railties/lib/rails/engine.rb | |
parent | 810837dda890a5bc5d0b4d65b973ca0ccc9465bd (diff) | |
download | rails-11aa167e239a85513d00a7910446bedf7b1f7800.tar.gz rails-11aa167e239a85513d00a7910446bedf7b1f7800.tar.bz2 rails-11aa167e239a85513d00a7910446bedf7b1f7800.zip |
Revert "Provide a unique point for running initializers."
This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25.
Conflicts:
railties/lib/rails/application/configuration.rb
railties/lib/rails/application/finisher.rb
railties/lib/rails/engine.rb
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r-- | railties/lib/rails/engine.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 86efc7332c..5c1af99fe2 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -583,8 +583,10 @@ module Rails end end - initializer :append_config_initializers do |app| - app.config.initializers_paths.concat config.paths["config/initializers"].existent.sort + initializer :load_config_initializers do + config.paths["config/initializers"].existent.sort.each do |initializer| + load(initializer) + end end initializer :engines_blank_point do |