aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorT.J. Schuck <tj@getharvest.com>2013-09-23 14:28:26 -0400
committerT.J. Schuck <tj@getharvest.com>2013-09-23 14:28:26 -0400
commit4a99e1019931481011c621fe89f715fe6dac9dd3 (patch)
tree524288a723aaf0c07d91fa64c3916c5feaf1cd22 /activemodel/lib
parentdd13722c264a84e81ce15a6ec168c84d4db460ca (diff)
downloadrails-4a99e1019931481011c621fe89f715fe6dac9dd3.tar.gz
rails-4a99e1019931481011c621fe89f715fe6dac9dd3.tar.bz2
rails-4a99e1019931481011c621fe89f715fe6dac9dd3.zip
bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/secure_password.rb6
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 8b9ac97bbb..17fafe4be9 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -20,9 +20,9 @@ module ActiveModel
# value to the password_confirmation attribute and the validation
# will not be triggered.
#
- # You need to add bcrypt-ruby (~> 3.1.0) to Gemfile to use #has_secure_password:
+ # You need to add bcrypt-ruby (~> 3.1.2) to Gemfile to use #has_secure_password:
#
- # gem 'bcrypt-ruby', '~> 3.1.0'
+ # gem 'bcrypt-ruby', '~> 3.1.2'
#
# Example using Active Record (which automatically includes ActiveModel::SecurePassword):
#
@@ -46,7 +46,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.1.0'
+ 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"