From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 16 Jun 2021 18:25:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee

---
 config.ru | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'config.ru')

diff --git a/config.ru b/config.ru
index 0c50b3fdf6f..ed76239ef2e 100644
--- a/config.ru
+++ b/config.ru
@@ -2,25 +2,10 @@
 
 # This file is used by Rack-based servers to start the application.
 
-if defined?(Unicorn)
-  require 'unicorn'
-
-  if ENV['RAILS_ENV'] == 'production' || ENV['RAILS_ENV'] == 'staging'
-    # Unicorn self-process killer
-    require 'unicorn/worker_killer'
-
-    min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 400 * 1 << 20).to_i
-    max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 650 * 1 << 20).to_i
-
-    # Max memory size (RSS) per worker
-    use Unicorn::WorkerKiller::Oom, min, max
-  end
-end
-
 require ::File.expand_path('../config/environment', __FILE__)
 
 def master_process?
-  Prometheus::PidProvider.worker_id.in? %w(unicorn_master puma_master)
+  Prometheus::PidProvider.worker_id == 'puma_master'
 end
 
 warmup do |app|
-- 
cgit v1.2.1