diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 68b327e0ad753e8c6a7daa9234f22894fdee2e73..77224a208a8c894f76e2779be5cffa7d7e2695bc 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 0a99cbd004e0cf753d6aa49cbcb2fb0eda62cd41..06505bddf977e92a550708357a067c422b9d7bd8 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -724,12 +724,6 @@ def reset_callbacks(name) # would call Audit#save. 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"