From c844755e5a0c3d4edfcc78f9c30ef91fa0de550a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 15 Feb 2005 00:51:02 +0000
Subject: Merged back the Routing branch

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/environments/shared.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/environments/shared.rb')

diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 8e36ae6670..f8a8e8cb6f 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -39,6 +39,8 @@ require_dependency "environments/#{RAILS_ENV}"
 ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
 ActiveRecord::Base.establish_connection
 
+Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')))
+
 
 # Configure defaults if the included environment did not.
 begin
-- 
cgit v1.2.3