aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-16 15:40:57 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-05-16 15:47:00 -0700
commit8bc1e532a92bc259c827f96df61cdb86c5e6baa0 (patch)
treea77cffbe4e2d0e11cb30a4c537ab56b581a587c9 /railties/lib/rails/engine.rb
parent78b6fdd89f541dfedd369da9957ee6eab9a8a586 (diff)
downloadrails-8bc1e532a92bc259c827f96df61cdb86c5e6baa0.tar.gz
rails-8bc1e532a92bc259c827f96df61cdb86c5e6baa0.tar.bz2
rails-8bc1e532a92bc259c827f96df61cdb86c5e6baa0.zip
Load all the env files available in config.paths (closes #6335)
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index ef48bc4f94..47856c87c6 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -567,8 +567,9 @@ module Rails
end
initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
- environment = paths["config/environments"].existent.first
- require environment if environment
+ paths["config/environments"].existent.each do |environment|
+ require environment
+ end
end
initializer :append_assets_path, :group => :all do |app|