aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/ordered_options.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-01-14 21:52:03 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-01-14 21:52:03 +0100
commit1aa1cec777bfbd25eba731c7e7872642ed5e4b15 (patch)
tree10b1138ac048195e3a6f2b98ba52770e90e2ef9f /activesupport/lib/active_support/ordered_options.rb
parent434ec2371498e99d4669453b66a4b9fa08f7a9a0 (diff)
downloadrails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.tar.gz
rails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.tar.bz2
rails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.zip
Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-token"
This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680. When merging the pull request, I misunderstood `has_secure_token` as declaring a model has a token from birth and through the rest of its lifetime. Therefore, supporting conditional creation doesn't make sense. You should never mark a model as having a secure token if there's a time when it shouldn't have it on creation.
Diffstat (limited to 'activesupport/lib/active_support/ordered_options.rb')
0 files changed, 0 insertions, 0 deletions