aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-02-21 00:57:33 +0000
committerAbdelkader Boudih <terminale@gmail.com>2015-02-21 00:57:33 +0000
commit43fb8182663be99418b346f5aa43b0fa1ac95ce4 (patch)
treeb674cec9202ec035e46289256b1c8fcbdd7cb768
parenta60e8ac79b7536fe0a3ff760488a437d4448619f (diff)
parent673653d44c9bba69fc73209e6320dd88dbeaf75f (diff)
downloadrails-43fb8182663be99418b346f5aa43b0fa1ac95ce4.tar.gz
rails-43fb8182663be99418b346f5aa43b0fa1ac95ce4.tar.bz2
rails-43fb8182663be99418b346f5aa43b0fa1ac95ce4.zip
Merge pull request #19023 from trliner/fix_has_secure_token_docs
Fix #has_secure_token documentation
-rw-r--r--activerecord/lib/active_record/secure_token.rb4
1 files 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'