aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/development.rb2
-rw-r--r--railties/environments/test.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/environments/development.rb b/railties/environments/development.rb
index d3681e28ca..aab4562a51 100644
--- a/railties/environments/development.rb
+++ b/railties/environments/development.rb
@@ -1,3 +1,5 @@
+require 'active_support/whiny_nil'
+
Dependencies.mechanism = :load
ActionController::Base.consider_all_requests_local = true
ActionController::Base.perform_caching = false
diff --git a/railties/environments/test.rb b/railties/environments/test.rb
index 8aa4c65af2..8c8746c4a0 100644
--- a/railties/environments/test.rb
+++ b/railties/environments/test.rb
@@ -1,3 +1,5 @@
+require 'active_support/whiny_nil'
+
Dependencies.mechanism = :require
ActionController::Base.consider_all_requests_local = true
ActionController::Base.perform_caching = false