diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 8c07a034cc0ae81570c4f5a5a145880d8b096c9b..4ca82910cc7c5379b34d16273e5cea2f3daad926 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated string based terminators for y`ActiveSupport::Callbacks`. + + *Yves Senn* + * Remove deprecated `String#encoding_aware?` core extensions (`core_ext/string/encoding`). *Arun Agrawal* diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 5c738572a8f96b1281794506fb66ae080ffb5c90..d2991a218baaa32d720aa2e602e02050b9f45a3c 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -718,12 +718,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"