From b92608770e20618ab6a6c67099dd19ae4533689e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 24 Jan 2010 12:15:46 +0100
Subject: Ensure environment config has higher priority than application ones.

---
 railties/lib/rails/application/bootstrap.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/lib/rails/application')

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 819d00be4e..3c339ffc57 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -3,6 +3,10 @@ module Rails
     module Bootstrap
       include Initializable
 
+      initializer :load_environment_config do |app|
+        app.require_environment!
+      end
+
       initializer :load_all_active_support do |app|
         require "active_support/all" unless app.config.active_support.bare
       end
-- 
cgit v1.2.3