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/highlight.rb | |
| parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) | |
| download | gitlab-ce-3ad11f24ca52d42694a8ce920a87ead6085d3f85.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/highlight.rb')
| -rw-r--r-- | lib/gitlab/highlight.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb index 2c243a0d0ae..22b9a038768 100644 --- a/lib/gitlab/highlight.rb +++ b/lib/gitlab/highlight.rb @@ -68,7 +68,7 @@ module Gitlab end def timeout_time - Sidekiq.server? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND + Gitlab::Runtime.sidekiq? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND end def link_dependencies(text, highlighted_text) |