aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
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 /railties/lib/rails/application.rb
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 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c8a6600da9..b30e6ff615 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -297,6 +297,15 @@ module Rails
error.message << ' Be sure to add rack-cache to your Gemfile'
raise
end
+
+ if rack_cache == true
+ rack_cache = {
+ :metastore => "rails:/",
+ :entitystore => "rails:/",
+ :verbose => false
+ }
+ end
+
require "action_dispatch/http/rack_cache"
middleware.use ::Rack::Cache, rack_cache
end