From 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Dec 2019 03:07:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/gitlab.rb')

diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index f2bff51df38..0e6db54eb46 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -100,8 +100,8 @@ module Gitlab
   end
 
   def self.process_name
-    return 'sidekiq' if Gitlab::Runtime.sidekiq?
-    return 'console' if Gitlab::Runtime.console?
+    return 'sidekiq' if Sidekiq.server?
+    return 'console' if defined?(Rails::Console)
     return 'test' if Rails.env.test?
 
     'web'
-- 
cgit v1.2.3