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.

2 files changed, 11 insertions, 9 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
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 874b3a78b6..a58f7e9079 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -43,14 +43,15 @@ module Rails
         @paths ||= begin
           paths = super
           paths.app.controllers << builtin_controller if builtin_controller
-          paths.config.database    "config/database.yml"
-          paths.config.environment "config/environments", :glob => "#{Rails.env}.rb"
-          paths.lib.templates      "lib/templates"
-          paths.log                "log/#{Rails.env}.log"
-          paths.tmp                "tmp"
-          paths.tmp.cache          "tmp/cache"
-          paths.vendor             "vendor", :load_path => true
-          paths.vendor.plugins     "vendor/plugins"
+          paths.config.database     "config/database.yml"
+          paths.config.environment  "config/environment.rb"
+          paths.config.environments "config/environments", :glob => "#{Rails.env}.rb"
+          paths.lib.templates       "lib/templates"
+          paths.log                 "log/#{Rails.env}.log"
+          paths.tmp                 "tmp"
+          paths.tmp.cache           "tmp/cache"
+          paths.vendor              "vendor", :load_path => true
+          paths.vendor.plugins      "vendor/plugins"
 
           if File.exists?("#{root}/test/mocks/#{Rails.env}")
             ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " <<