aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorT.J. Schuck <tj@getharvest.com>2014-02-21 15:58:09 -0500
committerT.J. Schuck <tj@getharvest.com>2014-02-25 09:52:32 -0500
commit53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7 (patch)
tree17ea353cd0715cc7350989f649253588cfd3286e /activemodel
parent6d35190bad0b054c9a1f4c736dc4dda32a7ebc91 (diff)
downloadrails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.tar.gz
rails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.tar.bz2
rails-53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7.zip
Bump version of bcrypt gem
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/secure_password.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index 01739d8ae4..826e89bf9d 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -20,9 +20,9 @@ module ActiveModel
# value to the password_confirmation attribute and the validation
# will not be triggered.
#
- # You need to add bcrypt-ruby (~> 3.1.2) to Gemfile to use #has_secure_password:
+ # You need to add bcrypt (~> 3.1.7) to Gemfile to use #has_secure_password:
#
- # gem 'bcrypt-ruby', '~> 3.1.2'
+ # gem 'bcrypt', '~> 3.1.7'
#
# Example using Active Record (which automatically includes ActiveModel::SecurePassword):
#
@@ -42,13 +42,13 @@ module ActiveModel
# User.find_by(name: 'david').try(:authenticate, 'notright') # => false
# User.find_by(name: 'david').try(:authenticate, 'mUc3m00RsqyRe') # => user
def has_secure_password(options = {})
- # Load bcrypt-ruby only when has_secure_password is used.
+ # Load bcrypt gem only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
# being dependent on a binary library.
begin
require 'bcrypt'
rescue LoadError
- $stderr.puts "You don't have bcrypt-ruby installed in your application. Please add it to your Gemfile and run bundle install"
+ $stderr.puts "You don't have bcrypt installed in your application. Please add it to your Gemfile and run bundle install"
raise
end