aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-03 10:14:11 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-03 10:14:11 -0700
commit8a9f4c6da43aac57cdb0078cee2bf35a2db3f25c (patch)
treebb3fe42359f002ea8fe2ecd0fae237b3d02f2b94 /railties
parent867c83060398c5f2fa63df35a3d31b49549b405e (diff)
parent9b02f3f41f9be96bcc61222a8dcd197c1a2edf79 (diff)
downloadrails-8a9f4c6da43aac57cdb0078cee2bf35a2db3f25c.tar.gz
rails-8a9f4c6da43aac57cdb0078cee2bf35a2db3f25c.tar.bz2
rails-8a9f4c6da43aac57cdb0078cee2bf35a2db3f25c.zip
Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index c83e7ddf80..910cd16950 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -10,6 +10,9 @@ source 'http://rubygems.org'
<%= assets_gemfile_entry %>
<%= javascript_gemfile_entry %>
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
# Use unicorn as the web server
# gem 'unicorn'