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 /app/services/git | |
| parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) | |
| download | gitlab-ce-3ad11f24ca52d42694a8ce920a87ead6085d3f85.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/git')
| -rw-r--r-- | app/services/git/base_hooks_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/git/base_hooks_service.rb b/app/services/git/base_hooks_service.rb index d935d9e8cdc..a49983a84fc 100644 --- a/app/services/git/base_hooks_service.rb +++ b/app/services/git/base_hooks_service.rb @@ -163,7 +163,7 @@ module Git end def logger - if Sidekiq.server? + if Gitlab::Runtime.sidekiq? Sidekiq.logger else # This service runs in Sidekiq, so this shouldn't ever be |