diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/highlight.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/search_results.rb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb index d28223194cc..a4e60bbd828 100644 --- a/lib/gitlab/highlight.rb +++ b/lib/gitlab/highlight.rb @@ -4,6 +4,7 @@ module Gitlab class Highlight TIMEOUT_BACKGROUND = 30.seconds TIMEOUT_FOREGROUND = 3.seconds + MAXIMUM_TEXT_HIGHLIGHT_SIZE = 1.megabyte def self.highlight(blob_name, blob_content, language: nil, plain: false) new(blob_name, blob_content, language: language) @@ -20,6 +21,8 @@ module Gitlab end def highlight(text, continue: true, plain: false) + plain ||= text.length > MAXIMUM_TEXT_HIGHLIGHT_SIZE + highlighted_text = highlight_text(text, continue: continue, plain: plain) highlighted_text = link_dependencies(text, highlighted_text) if blob_name highlighted_text diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 3dbb0608a4f..6c86ad11385 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -23,10 +23,6 @@ module Gitlab filename end - def no_highlighting? - false - end - # Since search results often contain many items, # not triggering lookup can avoid n+1 queries. def language_from_gitattributes |