aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/development.rb4
-rw-r--r--railties/environments/production.rb3
-rw-r--r--railties/environments/test.rb3
3 files changed, 3 insertions, 7 deletions
diff --git a/railties/environments/development.rb b/railties/environments/development.rb
index b8d4600759..42a43d59fb 100644
--- a/railties/environments/development.rb
+++ b/railties/environments/development.rb
@@ -1,5 +1,3 @@
+Dependencies.mechanism = :load
ActionController::Base.consider_all_requests_local = true
-ActionController::Base.reload_dependencies = true
-ActiveRecord::Base.reload_associations = true
-
BREAKPOINT_SERVER_PORT = 42531 \ No newline at end of file
diff --git a/railties/environments/production.rb b/railties/environments/production.rb
index 8e50475899..2069ebcf15 100644
--- a/railties/environments/production.rb
+++ b/railties/environments/production.rb
@@ -1,3 +1,2 @@
+Dependencies.mechanism = :require
ActionController::Base.consider_all_requests_local = false
-ActionController::Base.reload_dependencies = false
-ActiveRecord::Base.reload_associations = false
diff --git a/railties/environments/test.rb b/railties/environments/test.rb
index c20c260033..d4db0e9c64 100644
--- a/railties/environments/test.rb
+++ b/railties/environments/test.rb
@@ -1,4 +1,3 @@
+Dependencies.mechanism = :require
ActionController::Base.consider_all_requests_local = true
-ActionController::Base.reload_dependencies = false
-ActiveRecord::Base.reload_associations = false
ActionMailer::Base.delivery_method = :test \ No newline at end of file