aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-05 16:29:20 -0500
committerRafael França <rafaelmfranca@gmail.com>2016-05-05 16:29:20 -0500
commit1949412a868ccf5addc12b7569f6ebbf4b6488e4 (patch)
tree2f58157b9c08824cec604dfd10348aaee14cdf3d /activemodel
parent063bc008b3705abc7e762484efb1a3d2081910bc (diff)
parentf7d7147ae6b40ab06750e58c2edcc1c8046f90cb (diff)
downloadrails-1949412a868ccf5addc12b7569f6ebbf4b6488e4.tar.gz
rails-1949412a868ccf5addc12b7569f6ebbf4b6488e4.tar.bz2
rails-1949412a868ccf5addc12b7569f6ebbf4b6488e4.zip
Merge pull request #24799 from prathamesh-sonpatki/18439-followup
Active Model: Improve CHANGELOG and documentation for `validates_acceptance_of` [ci skip]
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index a35e20579d..d221eff1e7 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -123,11 +123,13 @@
*Wojciech Wnętrzak*
-* Change validates_acceptance_of to accept true by default.
+* Change `validates_acceptance_of` to accept `true` by default besides `'1'`.
- The default for validates_acceptance_of is now "1" and true.
- In the past, only "1" was the default and you were required to add
- accept: true.
+ The default for `validates_acceptance_of` is now `'1'` and `true`.
+ In the past, only `"1"` was the default and you were required to pass
+ `accept: true` separately.
+
+ *mokhan*
* Remove deprecated `ActiveModel::Dirty#reset_#{attribute}` and
`ActiveModel::Dirty#reset_changes`.