From ed44479d2420263cf7a703a7f2405ed194ba8269 Mon Sep 17 00:00:00 2001
From: Sruthi Chandran <srud@debian.org>
Date: Sat, 4 Sep 2021 02:49:33 +0530
Subject: [PATCH] Remove patches already applied upstream

---
 debian/patches/0440-remove-unicorn.patch  | 17 -------
 debian/patches/0499-93-relax-labkit.patch | 17 -------
 debian/patches/0620-pid-log-paths.patch   | 58 -----------------------
 debian/patches/series                     |  3 --
 4 files changed, 95 deletions(-)
 delete mode 100644 debian/patches/0440-remove-unicorn.patch
 delete mode 100644 debian/patches/0499-93-relax-labkit.patch
 delete mode 100644 debian/patches/0620-pid-log-paths.patch

diff --git a/debian/patches/0440-remove-unicorn.patch b/debian/patches/0440-remove-unicorn.patch
deleted file mode 100644
index ea38018cd2..0000000000
--- a/debian/patches/0440-remove-unicorn.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -181,11 +181,6 @@
- # 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 'puma', '~> 5.1', '>= 5.1.1', require: false
-   gem 'puma_worker_killer', '~> 0.3.1', require: false
diff --git a/debian/patches/0499-93-relax-labkit.patch b/debian/patches/0499-93-relax-labkit.patch
deleted file mode 100644
index cd921d4c04..0000000000
--- a/debian/patches/0499-93-relax-labkit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -297,12 +297,12 @@
- gem 'sentry-raven', '~> 3.0'
- 
- # PostgreSQL query parsing
--gem 'pg_query', '~> 1.3'
-+gem 'pg_query', '~> 2.0'
- 
- gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
- 
- # LabKit: Tracing and Correlation
--gem 'gitlab-labkit', '~> 0.16.2'
-+gem 'gitlab-labkit', '~> 0.17.1'
- # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
- # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
- gem 'thrift', '>= 0.14.0'
diff --git a/debian/patches/0620-pid-log-paths.patch b/debian/patches/0620-pid-log-paths.patch
deleted file mode 100644
index f5b5aa0362..0000000000
--- a/debian/patches/0620-pid-log-paths.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13415
-
---- a/bin/mail_room
-+++ b/bin/mail_room
-@@ -7,6 +7,11 @@
- mail_room_logfile="$app_root/log/mail_room.log"
- mail_room_config="$app_root/config/mail_room.yml"
- 
-+# Read configuration variable file if it is present
-+test -f /etc/default/gitlab && . /etc/default/gitlab
-+
-+mail_room_logfile=${mail_room_pid_path}
-+
- get_mail_room_pid()
- {
-   local pid
---- a/bin/web_unicorn
-+++ b/bin/web_unicorn
-@@ -7,6 +7,11 @@
- unicorn_config="$app_root/config/unicorn.rb"
- unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
- 
-+# Read configuration variable file if it is present
-+test -f /etc/default/gitlab && . /etc/default/gitlab
-+
-+unicorn_pidfile=${web_server_pid_path}
-+
- get_unicorn_pid()
- {
-   local pid
---- a/bin/background_jobs_sk
-+++ b/bin/background_jobs_sk
-@@ -7,6 +7,11 @@
- sidekiq_config="$app_root/config/sidekiq_queues.yml"
- gitlab_user=$(ls -l config.ru | awk '{print $3}')
- 
-+# Read configuration variable file if it is present
-+test -f /etc/default/gitlab && . /etc/default/gitlab
-+
-+sidekiq_pidfile=${sidekiq_pid_path}
-+
- warn()
- {
-   echo "$@" 1>&2
---- a/bin/background_jobs_sk_cluster
-+++ b/bin/background_jobs_sk_cluster
-@@ -6,6 +6,11 @@
- sidekiq_logfile="$app_root/log/sidekiq.log"
- gitlab_user=$(ls -l config.ru | awk '{print $3}')
- 
-+# Read configuration variable file if it is present
-+test -f /etc/default/gitlab && . /etc/default/gitlab
-+
-+sidekiq_pidfile=${sidekiq_pid_path}
-+
- warn()
- {
-   echo "$@" 1>&2
diff --git a/debian/patches/series b/debian/patches/series
index 1cfebedeae..cea84bb887 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 0340-relax-httparty.patch
 0350-relax-rdoc.patch
 0430-remove-gitlab-markup.patch
-0440-remove-unicorn.patch
 0480-embed-elasticsearch-model.patch
 0480-embed-elasticsearch-rails.patch
 0482-remove-ee-only-gems.patch
@@ -18,11 +17,9 @@
 0499-90-relax-webrick.patch
 0499-91-relax-omniauth-azure-activedirectory-v2.patch
 0499-92-relax-rexml.patch
-0499-93-relax-labkit.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0610-source-init-functions.patch
-0620-pid-log-paths.patch
 0630-fix-mail-room-path.patch
 0660-fix-gitlab-yml-path.patch
 0690-debian-usage-ping.patch