Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
index b0bcea0ca69..f60cac0aff0 100644
--- a/lib/gitlab/runtime.rb
+++ b/lib/gitlab/runtime.rb
@@ -15,8 +15,7 @@ module Gitlab
       :rails_runner,
       :rake,
       :sidekiq,
-      :test_suite,
-      :unicorn
+      :test_suite
     ].freeze
 
     class << self
@@ -36,11 +35,6 @@ module Gitlab
         !!defined?(::Puma)
       end
 
-      # For unicorn, we need to check for actual server instances to avoid false positives.
-      def unicorn?
-        !!(defined?(::Unicorn) && defined?(::Unicorn::HttpServer))
-      end
-
       def sidekiq?
         !!(defined?(::Sidekiq) && Sidekiq.server?)
       end
@@ -66,7 +60,7 @@ module Gitlab
       end
 
       def web_server?
-        puma? || unicorn?
+        puma?
       end
 
       def action_cable?