diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-29 08:39:44 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-29 08:39:52 +0200 |
| commit | 1b816d502444ce2b3153d8c689d0057f1c257eee (patch) | |
| tree | 4fb975de78c82295568b64bde76132084c8089ac /railties/lib/rails/application/bootstrap.rb | |
| parent | e33d304975f5b20b0ba819ab644a2a8f80ff3743 (diff) | |
| download | rails-1b816d502444ce2b3153d8c689d0057f1c257eee.tar.gz rails-1b816d502444ce2b3153d8c689d0057f1c257eee.tar.bz2 rails-1b816d502444ce2b3153d8c689d0057f1c257eee.zip | |
The rake task :environment now loads config/environment.rb instead of initializing the application on its own. This fixes [#4492 state:resolved] and also avoids the application being initialized twice in some rake tasks.
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 |