From 11aa167e239a85513d00a7910446bedf7b1f7800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 13 Dec 2011 08:49:04 +0100 Subject: 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 --- railties/lib/rails/engine.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/engine.rb') 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 -- cgit v1.2.3