aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-09-02 12:09:16 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:16 +0200
commit9af189ac8fde1988b9695cf1459b04c9a8a042ee (patch)
tree2409a2e91d875f45327847b160ebce135234a0c4 /railties/lib
parent6c906bf59111e09997787c1d4c5ba2ec2b783cdd (diff)
downloadrails-9af189ac8fde1988b9695cf1459b04c9a8a042ee.tar.gz
rails-9af189ac8fde1988b9695cf1459b04c9a8a042ee.tar.bz2
rails-9af189ac8fde1988b9695cf1459b04c9a8a042ee.zip
I've changed that test along the way, it should actually stay without changes
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/engine.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1990aa5261..e10980a6d9 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -427,12 +427,6 @@ module Rails
end
end
- initializer :load_config_initializers do
- paths.config.initializers.to_a.sort.each do |initializer|
- load(initializer)
- end
- end
-
initializer :load_environment_config, :before => :load_environment_hook do
environment = config.paths.config.environments.to_a.first
require environment if environment
@@ -454,6 +448,12 @@ module Rails
end
end
+ initializer :load_config_initializers do
+ paths.config.initializers.to_a.sort.each do |initializer|
+ load(initializer)
+ end
+ end
+
initializer :engines_blank_point do
# We need this initializer so all extra initializers added in engines are
# consistently executed after all the initializers above across all engines.