rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge pull request #20835 from ↵	Kasper Timm Hansen	2016-01-14	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|	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.
*	Support :if and :unless in has_secure_token	Griffin Smith	2016-01-09	1	-0/+3
\| \| \| \| \|	Pass through :if and :unless options from has_secure_token to the generated before_create callback
*	Add `ActiveRecord::Base.suppress`	Michael Ryan	2015-02-18	1	-0/+4
\|
*	Add has_secure_token to Active Record	robertomiranda	2015-01-04	1	-0/+4
	Update SecureToken Docs Add Changelog entry for has_secure_token [ci skip]