aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-10-04 19:58:19 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-10-04 19:58:19 -0700
commita8c8a08f1ae7099f750058ef3e168810e5ad47d8 (patch)
tree2f7392d0efa7e32c2500b0a9d3a95e81e0e639f4 /actionpack/lib
parent4b33bbc80374e486467f9a7b76e34e4ab2ce0b50 (diff)
parentab4c079536641e63ca51b6121864a75de7145256 (diff)
downloadrails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.tar.gz
rails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.tar.bz2
rails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.zip
Merge pull request #7838 from guilleiguaran/extract-rack-cache
Disable Rack::Cache by default
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/railtie.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index ccc0435a39..284dd180db 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -12,12 +12,7 @@ module ActionDispatch
config.action_dispatch.rescue_templates = { }
config.action_dispatch.rescue_responses = { }
config.action_dispatch.default_charset = nil
-
- config.action_dispatch.rack_cache = {
- :metastore => "rails:/",
- :entitystore => "rails:/",
- :verbose => false
- }
+ config.action_dispatch.rack_cache = false
config.action_dispatch.default_headers = {
'X-Frame-Options' => 'SAMEORIGIN',