Skip to content

Commit

Permalink
bcrypt-ruby stable is 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Burkhard Vogel-Kreykenbohm committed Jul 17, 2013
1 parent 74722d6 commit ad62cf6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gemspec
gem 'mocha', '~> 0.14', require: false

gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'bcrypt-ruby', '~> 3.1.0'
gem 'jquery-rails', '~> 2.2.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
Expand Down
6 changes: 3 additions & 3 deletions activemodel/lib/active_model/secure_password.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module ClassMethods
# value to the password_confirmation attribute and the validation
# will not be triggered.
#
# You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use #has_secure_password:
# You need to add bcrypt-ruby (~> 3.1.0) to Gemfile to use #has_secure_password:
#
# gem 'bcrypt-ruby', '~> 3.0.0'
# gem 'bcrypt-ruby', '~> 3.1.0'
#
# Example using Active Record (which automatically includes ActiveModel::SecurePassword):
#
Expand All @@ -44,7 +44,7 @@ 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.0.0'
gem 'bcrypt-ruby', '~> 3.1.0'
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"
Expand Down
2 changes: 1 addition & 1 deletion guides/code/getting_started/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ end
gem 'jbuilder', '~> 1.2'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
# gem 'bcrypt-ruby', '~> 3.1.0'

# Use unicorn as the app server
# gem 'unicorn'
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/rails/app/templates/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ group :doc do
end

# Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
# gem 'bcrypt-ruby', '~> 3.1.0'

# Use unicorn as the app server
# gem 'unicorn'
Expand Down

0 comments on commit ad62cf6

Please sign in to comment.