aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 16:21:56 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 16:21:56 +0000
commitdcfd6aa3bd91c93adf6ed47453a084327f018000 (patch)
tree18ced844d47153bb3118a9d92790883a7a361b35 /railties/environments
parentb3767f7f0bcb138ec3c677a39ffe0cb145e1427f (diff)
downloadrails-dcfd6aa3bd91c93adf6ed47453a084327f018000.tar.gz
rails-dcfd6aa3bd91c93adf6ed47453a084327f018000.tar.bz2
rails-dcfd6aa3bd91c93adf6ed47453a084327f018000.zip
Move Controllers wrapper module away from environment.rb and into dependencies.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/shared.rb2
-rw-r--r--railties/environments/shared_for_gem.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index bccc9c3e21..2d37714831 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -41,8 +41,6 @@ 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
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index f58d974cc1..057f664396 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -37,8 +37,6 @@ 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