diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
| commit | 175b4fa261259ab0d033482d10bb4159fee8e538 (patch) | |
| tree | e1f1dba5e41177f11ffded5a505e0e7f692b8df5 /lib/gitlab.rb | |
| parent | 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (diff) | |
| download | gitlab-ce-175b4fa261259ab0d033482d10bb4159fee8e538.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab.rb')
| -rw-r--r-- | lib/gitlab.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 0e6db54eb46..f2bff51df38 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -100,8 +100,8 @@ module Gitlab end def self.process_name - return 'sidekiq' if Sidekiq.server? - return 'console' if defined?(Rails::Console) + return 'sidekiq' if Gitlab::Runtime.sidekiq? + return 'console' if Gitlab::Runtime.console? return 'test' if Rails.env.test? 'web' |