aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-03-30 15:02:01 -0400
committerJon Moss <maclover7@users.noreply.github.com>2016-03-30 15:02:01 -0400
commite3056bc9f4a6a327bcfeacf2e979ffaec3c56cdd (patch)
treefab13c1147afcaaabc356fd9888fcbe269a43143 /activesupport
parentebaf95b276c4e89c82f6c79ac23e969d9400a068 (diff)
parent06a19b0166a0856a6effa2d0f82fa0b578c12ef0 (diff)
downloadrails-e3056bc9f4a6a327bcfeacf2e979ffaec3c56cdd.tar.gz
rails-e3056bc9f4a6a327bcfeacf2e979ffaec3c56cdd.tar.bz2
rails-e3056bc9f4a6a327bcfeacf2e979ffaec3c56cdd.zip
Merge pull request #24373 from silatham99/remove-meth-from-rails
Replace _meth with _method to remove ambiguity
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/callbacks.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index e6baddf5db..d878d44d02 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -571,15 +571,15 @@ module ActiveSupport
# Install a callback for the given event.
#
- # set_callback :save, :before, :before_meth
- # set_callback :save, :after, :after_meth, if: :condition
+ # set_callback :save, :before, :before_method
+ # set_callback :save, :after, :after_method, if: :condition
# set_callback :save, :around, ->(r, block) { stuff; result = block.call; stuff }
#
# The second argument indicates whether the callback is to be run +:before+,
# +:after+, or +:around+ the event. If omitted, +:before+ is assumed. This
# means the first example above can also be written as:
#
- # set_callback :save, :before_meth
+ # set_callback :save, :before_method
#
# The callback can be specified as a symbol naming an instance method; as a
# proc, lambda, or block; as a string to be instance evaluated(deprecated); or as an