summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-11-27 17:12:49 +0100
committerStan Hu <stanhu@gmail.com>2018-11-28 08:34:32 -0800
commitdc962788fa7589e948479f609a6feb29404d217b (patch)
tree60f9cad6d77f2aa71de85a7c4f0efef4bce8d636 /Gemfile
parent56da230826f76f0c16fbb5b7de4ced28d8f5cdae (diff)
downloadgitlab-ce-dc962788fa7589e948479f609a6feb29404d217b.tar.gz
Add monkey patch to unicorn to fix eof? problem
Rack with Unicorn is unable to handle chunked requests due to private `eof?` method. This exposes `eof?` not changing `rack` behavior. Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/8539
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 524d9d6a1de..c463c46a639 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,11 @@ gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
+
+# 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_versions['rack'] = rails5? ? '2.0.6' : '1.6.11'
# --- The end of special code for migrating to Rails 5.0 ---
source 'https://rubygems.org'
@@ -154,6 +159,8 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'
# Application server
+gem 'rack', gem_versions['rack']
+
group :unicorn do
gem 'unicorn', '~> 5.1.0'
gem 'unicorn-worker-killer', '~> 0.4.4'