aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-01-09 22:30:21 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-01-09 22:30:21 +0100
commit224eddfc0eeff6555ae88691306e61c7a9e8b758 (patch)
treeddd93f8de3d51333bd0ab18fb2f7181368c5500e /activerecord/CHANGELOG.md
parent9d681fc74c6251d5f2b93fa9576c9b2113116680 (diff)
parent21c0a1f3016b1de81f455f2a242803db91f96f17 (diff)
downloadrails-224eddfc0eeff6555ae88691306e61c7a9e8b758.tar.gz
rails-224eddfc0eeff6555ae88691306e61c7a9e8b758.tar.bz2
rails-224eddfc0eeff6555ae88691306e61c7a9e8b758.zip
Merge pull request #20835 from glittershark/if-and-unless-in-secure-token
Support :if and :unless in has_secure_token
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 3199951f68..56ac3b95b3 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Support `:if` and `:unless` options in `has_secure_token`
+
+ *Griffin Smith*
+
* Use `version` column as primary key for schema_migrations table because
schema_migrations versions are guaranteed to be unique.