diff options
| author | T.J. Schuck <tj@getharvest.com> | 2013-09-23 14:46:41 -0400 |
|---|---|---|
| committer | T.J. Schuck <tj@getharvest.com> | 2013-10-10 11:46:59 -0400 |
| commit | 5d7b413d84e5858dba50e716c31981b42c40aba6 (patch) | |
| tree | 15b3adf8d41331c8366ef7666127d0b5ffc7f8ab /activemodel/lib | |
| parent | 9dbd208562ccd3d68009a72d37cbfe29b94f98c4 (diff) | |
| download | rails-5d7b413d84e5858dba50e716c31981b42c40aba6.tar.gz rails-5d7b413d84e5858dba50e716c31981b42c40aba6.tar.bz2 rails-5d7b413d84e5858dba50e716c31981b42c40aba6.zip | |
Use bcrypt's public cost attr, not internal constant
See:
- https://github.com/codahale/bcrypt-ruby/pull/63
- https://github.com/codahale/bcrypt-ruby/pull/64
- https://github.com/codahale/bcrypt-ruby/pull/65
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 17fafe4be9..f87c36e39e 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -103,7 +103,7 @@ module ActiveModel def password=(unencrypted_password) unless unencrypted_password.blank? @password = unencrypted_password - cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine::DEFAULT_COST + cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost self.password_digest = BCrypt::Password.create(unencrypted_password, cost: cost) end end |