aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
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 /Gemfile
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 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7ac743cbd6..60c571f782 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gemspec
gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
-gem 'bcrypt-ruby', '~> 3.1.0'
+gem 'bcrypt-ruby', '~> 3.1.2'
gem 'jquery-rails', '~> 2.2.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'