From 673653d44c9bba69fc73209e6320dd88dbeaf75f Mon Sep 17 00:00:00 2001 From: Tim Liner <trliner@gmail.com> Date: Fri, 20 Feb 2015 18:40:24 -0600 Subject: Fix #has_secure_token documentation [ci skip] It's actually #validates_uniqueness_of that can generate a race condition rather than #validates_presence_of. --- activerecord/lib/active_record/secure_token.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/secure_token.rb b/activerecord/lib/active_record/secure_token.rb index 0990f815a7..a3023a0cb4 100644 --- a/activerecord/lib/active_record/secure_token.rb +++ b/activerecord/lib/active_record/secure_token.rb @@ -21,8 +21,8 @@ module ActiveRecord # SecureRandom::base58 is used to generate the 24-character unique token, so collisions are highly unlikely. # # Note that it's still possible to generate a race condition in the database in the same way that - # validates_presence_of can. You're encouraged to add a unique index in the database to deal with - # this even more unlikely scenario. + # <tt>validates_uniqueness_of</tt> can. You're encouraged to add a unique index in the database to deal + # with this even more unlikely scenario. def has_secure_token(attribute = :token) # Load securerandom only when has_secure_token is used. require 'active_support/core_ext/securerandom' -- cgit v1.2.3