summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-04 21:56:52 -0700
committerStan Hu <stanhu@gmail.com>2019-04-04 22:01:01 -0700
commit617dcfd5e4fef79feeaf24fde3e9478ca598bd69 (patch)
tree0f1eabec6155a2029046cc831fee7a86afd58cf3 /Gemfile
parentb54228ad3d79dc0bd7060128e0b75f68cd1c51d9 (diff)
downloadgitlab-ce-617dcfd5e4fef79feeaf24fde3e9478ca598bd69.tar.gz
Bump rack gem to 2.0.7sh-bump-rack-2.0.7
This update has two important fixes: 1. It reverts the monkey patch introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23385 since https://github.com/rack/rack/pull/1201 is now part of the release. 2. Preserve forwarded IP address for trusted proxy chains (https://github.com/rack/rack/pull/1343).
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index a3a56de8099..7c0019396c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,10 +139,7 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
-# The 2.0.6 version of rack requires monkeypatch to be present in
-# `config.ru`. This can be removed once a new update for Rack
-# is available that contains https://github.com/rack/rack/pull/1201.
-gem 'rack', '2.0.6'
+gem 'rack', '~> 2.0.7'
group :unicorn do
gem 'unicorn', '~> 5.4.1'