aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/strategy
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2017-06-10 11:01:43 -0700
committerJeremy Daer <jeremydaer@gmail.com>2017-06-10 11:04:34 -0700
commit816a3763d9bb070bf339de32c6a3ce31a45369f8 (patch)
tree2ae9cb2151b52120c3f1ed5e6c2a496b6f37f7cc /activesupport/lib/active_support/cache/strategy
parenta625292c793cd1fffdcf7576ac860c259493b140 (diff)
downloadrails-816a3763d9bb070bf339de32c6a3ce31a45369f8.tar.gz
rails-816a3763d9bb070bf339de32c6a3ce31a45369f8.tar.bz2
rails-816a3763d9bb070bf339de32c6a3ce31a45369f8.zip
Revert #25628. Incomplete change + needs a deprecation cycle.
See https://github.com/rails/rails/issues/29067#issuecomment-301342084 for rationale. This reverts commit b76f82d714e590c20370e72fa36fa574c4f17650. Fixes #29067. Fixes #29081.
Diffstat (limited to 'activesupport/lib/active_support/cache/strategy')
-rw-r--r--activesupport/lib/active_support/cache/strategy/local_cache.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 91875a56f5..0e4f383fb9 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -44,7 +44,7 @@ module ActiveSupport
yield
end
- def clear
+ def clear(options = nil)
@data.clear
end
@@ -79,9 +79,9 @@ module ActiveSupport
local_cache_key)
end
- def clear # :nodoc:
+ def clear(options = nil) # :nodoc:
return super unless cache = local_cache
- cache.clear
+ cache.clear(options)
super
end