summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-01 16:17:54 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-01 16:17:54 +0000
commitd9edea9735e01ff560cf77697719cc1db248ecef (patch)
tree9ee674699297a03fdf1f5c2796cd629026fa2fef /Gemfile
parent557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff)
parentfb056c78a7348b8f00024c908fa4b13c606cc1a7 (diff)
downloadgitlab-ce-d9edea9735e01ff560cf77697719cc1db248ecef.tar.gz
Merge branch 'upgrade-thin' into 'master'
Upgrade Thin from 1.6.1 to 1.7.0. Includes support for Rack 2. Working toward #14286. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG See merge request !5047
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 58efe6a2525..d622af6b0a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -264,7 +264,7 @@ group :development do
gem "sdoc", '~> 0.3.20'
# thin instead webrick
- gem 'thin', '~> 1.6.1'
+ gem 'thin', '~> 1.7.0'
end
group :development, :test do