aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-09 19:26:39 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-09 19:26:39 -0300
commitbfe6507f59426153c1991bf9de740c0393d08873 (patch)
tree394f263d73beba45d474ce02e643e1fe227a0162 /Gemfile
parente8655fa6b938d5c9d39d021be9ccef4f18c95b50 (diff)
parent7e504927090362d132d4e315c6f22915050fe5ba (diff)
downloadrails-bfe6507f59426153c1991bf9de740c0393d08873.tar.gz
rails-bfe6507f59426153c1991bf9de740c0393d08873.tar.bz2
rails-bfe6507f59426153c1991bf9de740c0393d08873.zip
Merge pull request #19689 from marutosi/master-issue-19187
[Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Windows
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0d2498a79e..ddaaacdc59 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'sprockets', '~> 3.0.0.rc.1'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
# being dependent on a binary library.
-gem 'bcrypt', '~> 3.1.7', require: false
+gem 'bcrypt', '~> 3.1.10', require: false
# This needs to be with require false to avoid
# it being automatically loaded by sprockets