diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 09:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 09:07:51 +0000 |
| commit | 3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch) | |
| tree | d5b664aafa7c2b65f470a700431d336d908c0ebc /lib/gitlab.rb | |
| parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) | |
| download | gitlab-ce-3ad11f24ca52d42694a8ce920a87ead6085d3f85.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' |