Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 15 insertions, 6 deletions

diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb
index 627abfbfe7e..9ed03c05f0b 100644
--- a/lib/gitlab/diff/file_collection/base.rb
+++ b/lib/gitlab/diff/file_collection/base.rb
@@ -117,8 +117,6 @@ module Gitlab
         end
 
         def sort_diffs(diffs)
-          return diffs unless Feature.enabled?(:sort_diffs, project, default_enabled: :yaml)
-
           Gitlab::Diff::FileCollectionSorter.new(diffs).sort
         end
       end
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index 8385bbbb3de..6a41ed0f29e 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -3,6 +3,8 @@
 module Gitlab
   module Diff
     class Highlight
+      PREFIX_REGEXP = /\A(.)/.freeze
+
       attr_reader :diff_file, :diff_lines, :repository, :project
 
       delegate :old_path, :new_path, :old_sha, :new_sha, to: :diff_file, prefix: :diff
@@ -85,6 +87,7 @@ module Gitlab
 
       def highlight_line(diff_line)
         return unless diff_file && diff_file.diff_refs
+        return diff_line_highlighting(diff_line, plain: true) if blobs_too_large?
 
         if Feature.enabled?(:diff_line_syntax_highlighting, project, default_enabled: :yaml)
           diff_line_highlighting(diff_line)
@@ -93,16 +96,17 @@ module Gitlab
         end
       end
 
-      def diff_line_highlighting(diff_line)
+      def diff_line_highlighting(diff_line, plain: false)
         rich_line = syntax_highlighter(diff_line).highlight(
           diff_line.text(prefix: false),
+          plain: plain,
           context: { line_number: diff_line.line }
-        )&.html_safe
+        )
 
         # Only update text if line is found. This will prevent
         # issues with submodules given the line only exists in diff content.
         if rich_line
-          line_prefix = diff_line.text =~ /\A(.)/ ? Regexp.last_match(1) : ' '
+          line_prefix = diff_line.text =~ PREFIX_REGEXP ? Regexp.last_match(1) : ' '
           rich_line.prepend(line_prefix).concat("\n")
         end
       end
@@ -131,7 +135,7 @@ module Gitlab
         # Only update text if line is found. This will prevent
         # issues with submodules given the line only exists in diff content.
         if rich_line
-          line_prefix = diff_line.text =~ /\A(.)/ ? Regexp.last_match(1) : ' '
+          line_prefix = diff_line.text =~ PREFIX_REGEXP ? Regexp.last_match(1) : ' '
           "#{line_prefix}#{rich_line}".html_safe
         end
       end
@@ -156,6 +160,13 @@ module Gitlab
         blob.load_all_data!
         blob.present.highlight.lines
       end
+
+      def blobs_too_large?
+        return false unless Feature.enabled?(:limited_diff_highlighting, project, default_enabled: :yaml)
+        return true if Gitlab::Highlight.too_large?(diff_file.old_blob&.size)
+
+        Gitlab::Highlight.too_large?(diff_file.new_blob&.size)
+      end
     end
   end
 end