Skip to content
Permalink
Browse files

Remove deprecated ActiveSupport::Cache::Store.instrument

  • Loading branch information
rafaelfranca committed Jan 3, 2015
1 parent c7a1fa3 commit a3ce6ca30ed0e77496c63781af596b149687b6d7
Showing with 5 additions and 14 deletions.
  1. +5 −1 activesupport/CHANGELOG.md
  2. +0 −13 activesupport/lib/active_support/cache.rb
@@ -1,3 +1,8 @@
* Remove deprecated methods `ActiveSupport::Cache::Store.instrument` and
`ActiveSupport::Cache::Store.instrument=`.

*Rafael Mendonça França*

* Change the way in which callback chains can be halted.

The preferred method to halt a callback chain from now on is to explicitly
@@ -8,7 +13,6 @@
`Callbacks::CallbackChain.halt_and_display_warning_on_return_false`, will
either not work at all or display a deprecation warning.


* Add Callbacks::CallbackChain.halt_and_display_warning_on_return_false

Setting `Callbacks::CallbackChain.halt_and_display_warning_on_return_false`
@@ -8,7 +8,6 @@
require 'active_support/core_ext/numeric/time'
require 'active_support/core_ext/object/to_param'
require 'active_support/core_ext/string/inflections'
require 'active_support/deprecation'

module ActiveSupport
# See ActiveSupport::Cache::Store for documentation.
@@ -179,18 +178,6 @@ def mute
@silence = previous_silence
end

# :deprecated:
def self.instrument=(boolean)
ActiveSupport::Deprecation.warn "ActiveSupport::Cache.instrument= is deprecated and will be removed in Rails 5. Instrumentation is now always on so you can safely stop using it."
true
end

# :deprecated:
def self.instrument
ActiveSupport::Deprecation.warn "ActiveSupport::Cache.instrument is deprecated and will be removed in Rails 5. Instrumentation is now always on so you can safely stop using it."
true
end

# Fetches data from the cache, using the given key. If there is data in
# the cache with the given key, then that data is returned.
#

0 comments on commit a3ce6ca

Please sign in to comment.
You can’t perform that action at this time.