From c196da8e5f6b79459470e8d14b63227ac1aa1ece Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 20 Aug 2020 20:02:30 +0530
Subject: [PATCH] Remove unicorn from Gemfile and choose puma

---
 debian/patches/0440-remove-puma.patch    | 16 ----------------
 debian/patches/0440-remove-unicorn.patch | 22 ++++++++++++++++++++++
 debian/patches/series                    |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 debian/patches/0440-remove-puma.patch
 create mode 100644 debian/patches/0440-remove-unicorn.patch

diff --git a/debian/patches/0440-remove-puma.patch b/debian/patches/0440-remove-puma.patch
deleted file mode 100644
index 8ad2bcb208..0000000000
--- a/debian/patches/0440-remove-puma.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We are using unicorn so don't need puma
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -172,11 +172,6 @@
-   gem 'unicorn-worker-killer', '~> 0.4.4'
- end
- 
--group :puma do
--  gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
--  gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
--end
--
- # State machine
- gem 'state_machines-activerecord', '~> 0.6.0'
- 
diff --git a/debian/patches/0440-remove-unicorn.patch b/debian/patches/0440-remove-unicorn.patch
new file mode 100644
index 0000000000..7d8a24dc03
--- /dev/null
+++ b/debian/patches/0440-remove-unicorn.patch
@@ -0,0 +1,22 @@
+puma is default from gitlab 12.9 and unicorn will be removed from 14.0
+gitlab-puma changes is included in puma package.
+
+--- a/Gemfile
++++ b/Gemfile
+@@ -167,14 +167,9 @@
+ # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
+ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
+ 
+-group :unicorn do
+-  gem 'unicorn', '~> 5.5'
+-  gem 'unicorn-worker-killer', '~> 0.4.4'
+-end
+-
+ group :puma do
+-  gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
+-  gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
++  gem 'puma', '~> 4.3.3', require: false
++  gem 'puma_worker_killer', '~> 0.1.1', require: false
+ end
+ 
+ # State machine
diff --git a/debian/patches/series b/debian/patches/series
index 60e1f35502..917e7bc434 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@
 0350-relax-rdoc.patch
 0350-relax-method-source.patch
 0430-remove-gitlab-markup.patch
-0440-remove-puma.patch
+0440-remove-unicorn.patch
 0480-embed-elasticsearch-model.patch
 0480-embed-elasticsearch-rails.patch
 0480-embed-faraday-middleware-aws-signers-v4.patch