diff options
| author | eileencodes <eileencodes@gmail.com> | 2014-05-13 19:51:57 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2014-05-13 19:51:57 -0400 |
| commit | b342d2baef4c0aa108f62e67d2bdb9b6641d6363 (patch) | |
| tree | 794bbedd6b23f00875747303b2851e5750e0cd42 /activesupport | |
| parent | 33d6e3be623d4dbcec077e62699272cbdcd23f37 (diff) | |
| download | rails-b342d2baef4c0aa108f62e67d2bdb9b6641d6363.tar.gz rails-b342d2baef4c0aa108f62e67d2bdb9b6641d6363.tar.bz2 rails-b342d2baef4c0aa108f62e67d2bdb9b6641d6363.zip | |
remove deprecation warning
This deprecation was released in 4.1.0 and can be removed for 4.2.0,
deprecation message / handling is no longer necessary.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 68b327e0ad..77224a208a 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated string based terminators for `ActiveSupport::Callbacks`. + + *Eileen M. Uchitelle* + * Fixed an issue when using `ActiveSupport::NumberHelper::NumberToDelimitedConverter` to convert a value that is an `ActiveSupport::SafeBuffer` introduced diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 0a99cbd004..06505bddf9 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -724,12 +724,6 @@ module ActiveSupport # would call <tt>Audit#save</tt>. def define_callbacks(*names) options = names.extract_options! - if options.key?(:terminator) && String === options[:terminator] - ActiveSupport::Deprecation.warn "String based terminators are deprecated, please use a lambda" - value = options[:terminator] - line = class_eval "lambda { |result| #{value} }", __FILE__, __LINE__ - options[:terminator] = lambda { |target, result| target.instance_exec(result, &line) } - end names.each do |name| class_attribute "_#{name}_callbacks" |