aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-10-24 13:32:59 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-10-24 19:31:13 -0200
commitc31b900221cb15386235145b4a809a02abee8df9 (patch)
treeadaf1674b9f08fda978cb64cc8127872c28f26d1 /activemodel
parent6c570648ad93180f35a3c5a096d191871ee06546 (diff)
downloadrails-c31b900221cb15386235145b4a809a02abee8df9.tar.gz
rails-c31b900221cb15386235145b4a809a02abee8df9.tar.bz2
rails-c31b900221cb15386235145b4a809a02abee8df9.zip
Merge pull request #12635 from mperham/4-0-stable
Allow any version of BCrypt
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/secure_password.rb1
1 files changed, 0 insertions, 1 deletions
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"