aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2015-12-16 10:22:15 -0500
committerEileen M. Uchitelle <eileencodes@gmail.com>2015-12-16 10:22:15 -0500
commited5d14ca53ec0262c9338621a1d0c8e80a03c516 (patch)
tree840f46461c4205f6fd85700291174f6615f4a157
parent89f776402dbaca581ef4bb342bb89db922124c7a (diff)
parentca512bb74151ad6fcdcd6ef8e22c84315d390d4f (diff)
downloadrails-ed5d14ca53ec0262c9338621a1d0c8e80a03c516.tar.gz
rails-ed5d14ca53ec0262c9338621a1d0c8e80a03c516.tar.bz2
rails-ed5d14ca53ec0262c9338621a1d0c8e80a03c516.zip
Merge pull request #22612 from caike/master
Mention the correct way to halt callback chains
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index fa6a01671b..9ba5021c4a 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -53,7 +53,7 @@ Don't forget to review the difference, to see if there were any unexpected chang
Upgrading from Rails 4.2 to Rails 5.0
-------------------------------------
-### Halting callback chains by returning `false`
+### Halting callback chains via `throw(:abort)`
In Rails 4.2, when a 'before' callback returns `false` in Active Record
and Active Model, then the entire callback chain is halted. In other words,