aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-18 14:31:52 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-18 14:34:26 -0300
commit90733e70d7d7a41bc7d5b0bebd357dd4950c833e (patch)
treebdf5f9460f85a56643cc390275311b9133f77c17 /railties/lib
parent12fb9372bf75d73481b3323b2c84d1851f5d6304 (diff)
downloadrails-90733e70d7d7a41bc7d5b0bebd357dd4950c833e.tar.gz
rails-90733e70d7d7a41bc7d5b0bebd357dd4950c833e.tar.bz2
rails-90733e70d7d7a41bc7d5b0bebd357dd4950c833e.zip
Don't use action_controller.perform_caching to enable rack-rack.
Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index eff5bbbdd6..9ef001c7d0 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -286,7 +286,7 @@ module Rails
def default_middleware_stack #:nodoc:
ActionDispatch::MiddlewareStack.new.tap do |middleware|
app = self
- if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
+ if rack_cache = config.action_dispatch.rack_cache
begin
require 'rack/cache'
rescue LoadError => error