From c31b900221cb15386235145b4a809a02abee8df9 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Thu, 24 Oct 2013 13:32:59 -0700
Subject: Merge pull request #12635 from mperham/4-0-stable

Allow any version of BCrypt
---
 activemodel/lib/active_model/secure_password.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activemodel/lib/active_model')

diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index f87c36e39e..7e694b5c50 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -46,7 +46,6 @@ module ActiveModel
         # 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"
-- 
cgit v1.2.3