aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-27 17:38:45 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-27 17:38:45 -0300
commit67d7dfd082ba395bca5d937d039f50965dfc03ab (patch)
treebef408611f06b3dd010a5b669097e56190f5ba0a
parent3f596f8ad37bcebbccbc51ee0190d2949abdc69d (diff)
parentc97b18a347e75aadcd6fff85ecb1ba822b02e4d8 (diff)
downloadrails-67d7dfd082ba395bca5d937d039f50965dfc03ab.tar.gz
rails-67d7dfd082ba395bca5d937d039f50965dfc03ab.tar.bz2
rails-67d7dfd082ba395bca5d937d039f50965dfc03ab.zip
Merge pull request #15946 from jamesprior/patch-1
Update documentation for run_callbacks
-rw-r--r--activesupport/lib/active_support/callbacks.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 06505bddf9..e5dbe214b4 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -71,7 +71,8 @@ module ActiveSupport
# order.
#
# If the callback chain was halted, returns +false+. Otherwise returns the
- # result of the block, or +true+ if no block is given.
+ # result of the block, nil if no callbacks have been set, or +true+
+ # if callbacks have been set but no block is given.
#
# run_callbacks :save do
# save