aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 11:48:10 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-23 11:48:10 -0700
commiteb69a1098c42dbe7b48fa728bd1a1f0dca093615 (patch)
treebd54c965341ab1a37ff57b919048eab50ffe2ca3 /railties/lib/rails/generators
parent83b92c67ccdec1961b563d1ca8eee68b3fa6ecc3 (diff)
parent4a99e1019931481011c621fe89f715fe6dac9dd3 (diff)
downloadrails-eb69a1098c42dbe7b48fa728bd1a1f0dca093615.tar.gz
rails-eb69a1098c42dbe7b48fa728bd1a1f0dca093615.tar.bz2
rails-eb69a1098c42dbe7b48fa728bd1a1f0dca093615.zip
Merge pull request #12325 from tjschuck/bcrypt_version_bump
Bump bcrypt-ruby version to support Ruby 2.0 on Windows
Diffstat (limited to 'railties/lib/rails/generators')
-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 adc83353b4..5cbca838f4 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -16,7 +16,7 @@ group :doc do
end
# Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.0'
+# gem 'bcrypt-ruby', '~> 3.1.2'
# Use unicorn as the app server
# gem 'unicorn'