aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-26 08:11:50 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-26 08:11:50 -0300
commit89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25 (patch)
treed9e0bf2391755761538f9b544ff1f61ef7799c5a /railties
parent1d298bd6217d6c0feb3aa698d65289b92b11ab8d (diff)
parent53f1ab523bbf4f1764e3e24f26c4ed1db61b69e7 (diff)
downloadrails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.tar.gz
rails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.tar.bz2
rails-89b4b51fdca4fb3994f6c5398a6fa1205cf1fd25.zip
Merge pull request #14149 from tjschuck/bcrypt_gem_rename
Bump version of bcrypt gem
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 6d017e187d..a9b6787894 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -14,7 +14,7 @@ source 'https://rubygems.org'
<% end -%>
# Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.2'
+# gem 'bcrypt', '~> 3.1.7'
# Use unicorn as the app server
# gem 'unicorn'