Skip to content

Commit 522110a

Browse files
committed
Merge pull request rails#15100 from eileencodes/remove-deprecation-warning-no-longer-needed
remove deprecation warning
2 parents 348af15 + b342d2b commit 522110a

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

activesupport/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated string based terminators for `ActiveSupport::Callbacks`.
2+
3+
*Eileen M. Uchitelle*
4+
15
* Fixed an issue when using
26
`ActiveSupport::NumberHelper::NumberToDelimitedConverter` to
37
convert a value that is an `ActiveSupport::SafeBuffer` introduced

activesupport/lib/active_support/callbacks.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -724,12 +724,6 @@ def reset_callbacks(name)
724724
# would call <tt>Audit#save</tt>.
725725
def define_callbacks(*names)
726726
options = names.extract_options!
727-
if options.key?(:terminator) && String === options[:terminator]
728-
ActiveSupport::Deprecation.warn "String based terminators are deprecated, please use a lambda"
729-
value = options[:terminator]
730-
line = class_eval "lambda { |result| #{value} }", __FILE__, __LINE__
731-
options[:terminator] = lambda { |target, result| target.instance_exec(result, &line) }
732-
end
733727

734728
names.each do |name|
735729
class_attribute "_#{name}_callbacks"

0 commit comments

Comments
 (0)