diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
| commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
| tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /lib/gitlab/highlight.rb | |
| parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) | |
| download | gitlab-ce-9763c081708e4c2e08de1f4e9ca9abdef5cffe3c.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 22b9a038768..2c243a0d0ae 100644 --- a/lib/gitlab/highlight.rb +++ b/lib/gitlab/highlight.rb @@ -68,7 +68,7 @@ module Gitlab end def timeout_time - Gitlab::Runtime.sidekiq? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND + Sidekiq.server? ? TIMEOUT_BACKGROUND : TIMEOUT_FOREGROUND end def link_dependencies(text, highlighted_text) |