diff options
Diffstat (limited to 'railties/environments')
| -rw-r--r-- | railties/environments/shared.rb | 2 | ||||
| -rw-r--r-- | railties/environments/shared_for_gem.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index 0e30f1368b..f47586ebcc 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -35,7 +35,7 @@ require 'action_mailer' # Environment-specific configuration. -ActionController::Base.require_or_load "environments/#{RAILS_ENV}" +require_dependency "environments/#{RAILS_ENV}" ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) ActiveRecord::Base.establish_connection diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb index 0316522258..c8aa36a505 100644 --- a/railties/environments/shared_for_gem.rb +++ b/railties/environments/shared_for_gem.rb @@ -32,7 +32,7 @@ require_gem 'rails' # Environment-specific configuration. -ActionController::Base.require_or_load "environments/#{RAILS_ENV}" +require_dependency "environments/#{RAILS_ENV}" ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) ActiveRecord::Base.establish_connection |