diff options
| author | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
| commit | 0fe8827bf384cb99ab757236555c7af18793d515 (patch) | |
| tree | a7ac2143c78964cad8ee87d9ff8a1c52abf61249 /railties/lib/rails/application/bootstrap.rb | |
| parent | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (diff) | |
| parent | 6b559474fb7fae0160860fc62752da347af032b2 (diff) | |
| download | rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.gz rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.bz2 rails-0fe8827bf384cb99ab757236555c7af18793d515.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/application/bootstrap.rb')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 06243f2e5e..022e1a91d8 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -6,7 +6,8 @@ module Rails include Initializable initializer :load_environment_config do - require_environment! + environment = config.paths.config.environments.to_a.first + require environment if environment end initializer :load_all_active_support do |