From dcfd6aa3bd91c93adf6ed47453a084327f018000 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 15 Feb 2005 16:21:56 +0000 Subject: 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 --- railties/environments/shared.rb | 2 -- railties/environments/shared_for_gem.rb | 2 -- 2 files changed, 4 deletions(-) (limited to 'railties/environments') 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 -- cgit v1.2.3