aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-02-16 15:03:37 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-02-16 15:03:37 -0800
commita71350cae0082193ad8c66d65ab62e8bb0b7853b (patch)
treeef74f99faf0750fa4d2829494a5facf7b677d2cb /railties
parent05b6e5d8b728e4e6cc70b9d7eb5b60160b01d168 (diff)
downloadrails-a71350cae0082193ad8c66d65ab62e8bb0b7853b.tar.gz
rails-a71350cae0082193ad8c66d65ab62e8bb0b7853b.tar.bz2
rails-a71350cae0082193ad8c66d65ab62e8bb0b7853b.zip
Revert "Don't unhook autoloading in production"
This reverts commit a8bf12979e5fa15282b39c8cfa315e663f613539.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/finisher.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7a1bb1e25c..0599e988d9 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -108,6 +108,13 @@ module Rails
ActionDispatch::Reloader.to_cleanup(&callback)
end
end
+
+ # Disable dependency loading during request cycle
+ initializer :disable_dependency_loading do
+ if config.eager_load && config.cache_classes
+ ActiveSupport::Dependencies.unhook!
+ end
+ end
end
end
end