diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
| commit | 9b14160725d91f8824b35223f16bf073a97bf7de (patch) | |
| tree | 121f5165f80d2c921b4135566b3c9e620531434d /lib/gitlab/highlight.rb | |
| parent | 27622f7417713cbd2057a7f642e9ce128d9fc169 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/highlight.rb')
| -rw-r--r-- | lib/gitlab/highlight.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb index 07c43fa4832..63cf80a10ed 100644 --- a/lib/gitlab/highlight.rb +++ b/lib/gitlab/highlight.rb @@ -3,8 +3,8 @@ module Gitlab class Highlight TIMEOUT_BACKGROUND = 30.seconds - TIMEOUT_FOREGROUND = 3.seconds - MAXIMUM_TEXT_HIGHLIGHT_SIZE = 1.megabyte + TIMEOUT_FOREGROUND = 1.5.seconds + MAXIMUM_TEXT_HIGHLIGHT_SIZE = 512.kilobytes def self.highlight(blob_name, blob_content, language: nil, plain: false) new(blob_name, blob_content, language: language) |