diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 10 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/railtie.rb | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index f07c6fe828..df93bb3d27 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 4.0.0 (unreleased) ## +* The `Rack::Cache` middleware is now disabled by default. To enable it, + set `config.action_dispatch.rack_cache = true` and add `gem rack-cache` to your Gemfile. + + *Guillermo Iguaran* + * `ActionController::Base.page_cache_extension` option is deprecated in favour of `ActionController::Base.default_static_extension`. @@ -13,10 +18,9 @@ * Failsafe exception returns text/plain. *Steve Klabnik* -* Remove actionpack's rack-cache dependency and declare the - dependency in the Gemfile. +* Remove `rack-cache` dependency from Action Pack and declare it on Gemfile - *Guillermo Iguarán* + *Guillermo Iguaran* * Rename internal variables on ActionController::TemplateAssertions to prevent naming collisions. @partials, @templates and @layouts are now prefixed with an underscore. 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', |