aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-10-01 19:17:31 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-10-01 19:17:31 +0200
commitf78650d56e75ee266a17e12cd97a136d10484a67 (patch)
treedeed1044692fa672ae1a9f74ed4164be8cd4337e /activemodel
parent7db7b287ecd616d61dd09147888d02b74d219dd1 (diff)
parente2b3ccd1aa56ae467b0fe5c7466136a4d18fa7ef (diff)
downloadrails-f78650d56e75ee266a17e12cd97a136d10484a67.tar.gz
rails-f78650d56e75ee266a17e12cd97a136d10484a67.tar.bz2
rails-f78650d56e75ee266a17e12cd97a136d10484a67.zip
Merge pull request #21760 from repinel/refactor-as-callbacks-halt-config
Refactor AS::Callbacks halt config and fix the documentation
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index bf0120122d..a3368cd197 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -119,10 +119,10 @@
The preferred method to halt a callback chain from now on is to explicitly
`throw(:abort)`.
- In the past, returning `false` in an ActiveModel or ActiveModel::Validations
- `before_` callback had the side effect of halting the callback chain.
+ In the past, returning `false` in an Active Model `before_` callback had
+ the side effect of halting the callback chain.
This is not recommended anymore and, depending on the value of the
- `config.active_support.halt_callback_chains_on_return_false` option, will
+ `ActiveSupport.halt_callback_chains_on_return_false` option, will
either not work at all or display a deprecation warning.