diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-05-13 17:23:58 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-05-13 17:23:58 -0700 |
| commit | 522110af700efa0fff203f5bbccb70f06a9e28ee (patch) | |
| tree | 07ef76a68721ec7afe7ae5dd0ac13cddeec3cb56 | |
| parent | 348af15c3353e771c662638baeff02f1ae91e5d9 (diff) | |
| parent | b342d2baef4c0aa108f62e67d2bdb9b6641d6363 (diff) | |
| download | rails-522110af700efa0fff203f5bbccb70f06a9e28ee.tar.gz rails-522110af700efa0fff203f5bbccb70f06a9e28ee.tar.bz2 rails-522110af700efa0fff203f5bbccb70f06a9e28ee.zip | |
Merge pull request #15100 from eileencodes/remove-deprecation-warning-no-longer-needed
remove deprecation warning
| -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" |