Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb
index 78c5ace7b2b..6d04c4874c7 100644
--- a/lib/gitlab/diff/file_collection/base.rb
+++ b/lib/gitlab/diff/file_collection/base.rb
@@ -85,6 +85,10 @@ module Gitlab
           # No-op
         end
 
+        def overflow?
+          raw_diff_files.overflow?
+        end
+
         private
 
         def empty_pagination_data
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
index d2ca86fdfe7..0c68a57daab 100644
--- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
+++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb
@@ -48,6 +48,10 @@ module Gitlab
           @merge_request_diff.real_size
         end
 
+        def overflow?
+          @merge_request_diff.overflow?
+        end
+
         private
 
         def highlight_cache