Merge pull request #12635 from mperham/4-0-stable

Allow any version of BCrypt
2013-10-24 13:32:59 -07:00 · 2013-10-24 13:32:59 -07:00 · c31b900221
commit c31b900221
parent 6c570648ad
1 changed files with 0 additions and 1 deletions
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@ -46,7 +46,6 @@ def has_secure_password(options = {})
        # This is to avoid ActiveModel (and by extension the entire framework)
        # being dependent on a binary library.
        begin
-          gem 'bcrypt-ruby', '~> 3.1.2'
          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"