aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/bootstrap.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-18 23:23:54 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:04 +0200
commit7cccfed5943cddd6d72ed0df0ee7291cca9025ad (patch)
tree5750097c50f8359a4a83ffce97e41d60d9d87af6 /railties/lib/rails/application/bootstrap.rb
parent15f95b98ac048407a1ce6873bb02fc5fbb6c991c (diff)
downloadrails-7cccfed5943cddd6d72ed0df0ee7291cca9025ad.tar.gz
rails-7cccfed5943cddd6d72ed0df0ee7291cca9025ad.tar.bz2
rails-7cccfed5943cddd6d72ed0df0ee7291cca9025ad.zip
Allow Engines loading its own environment file from config/environments
Diffstat (limited to 'railties/lib/rails/application/bootstrap.rb')
-rw-r--r--railties/lib/rails/application/bootstrap.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 44e26b5713..e39b3bc705 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -6,10 +6,7 @@ module Rails
module Bootstrap
include Initializable
- initializer :load_environment_config do
- environment = config.paths.config.environments.to_a.first
- require environment if environment
- end
+ initializer :load_environment_hook do end
initializer :load_active_support do
require 'active_support/dependencies'
@@ -73,4 +70,4 @@ module Rails
end
end
end
-end \ No newline at end of file
+end