diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-17 09:51:39 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-17 09:51:39 -0700 |
| commit | e1595c2cad558bf2edc52fe73483387caa31a046 (patch) | |
| tree | 67a094593b9308b63efd34f093e1be2add3d9bd2 /activemodel/lib | |
| parent | 1a58ac60d92110cc9a83c976ac1fbd7bfd071966 (diff) | |
| parent | ad62cf68f89506b0a5074fec8e08d104865aa0ee (diff) | |
| download | rails-e1595c2cad558bf2edc52fe73483387caa31a046.tar.gz rails-e1595c2cad558bf2edc52fe73483387caa31a046.tar.bz2 rails-e1595c2cad558bf2edc52fe73483387caa31a046.zip | |
Merge pull request #11469 from bvogel/master
Update bcrypt-ruby stable version to 3.1
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 7156f1bb30..3d6de33e1e 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -18,9 +18,9 @@ module ActiveModel # value to the password_confirmation attribute and the validation # will not be triggered. # - # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use #has_secure_password: + # You need to add bcrypt-ruby (~> 3.1.0) to Gemfile to use #has_secure_password: # - # gem 'bcrypt-ruby', '~> 3.0.0' + # gem 'bcrypt-ruby', '~> 3.1.0' # # Example using Active Record (which automatically includes ActiveModel::SecurePassword): # @@ -44,7 +44,7 @@ module ActiveModel # This is to avoid ActiveModel (and by extension the entire framework) # being dependent on a binary library. begin - gem 'bcrypt-ruby', '~> 3.0.0' + gem 'bcrypt-ruby', '~> 3.1.0' 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" |