aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-26 08:11:50 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-26 08:11:50 -0300
commit89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25 (patch)
treed9e0bf2391755761538f9b544ff1f61ef7799c5a /activemodel
parent1d298bd6217d6c0feb3aa698d65289b92b11ab8d (diff)
parent53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7 (diff)
downloadrails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.tar.gz
rails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.tar.bz2
rails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.zip
Merge pull request #14149 from tjschuck/bcrypt_gem_rename
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