From a404ab380db5959ab22b09bc586607b1f6c507cd Mon Sep 17 00:00:00 2001 From: Paco Guzman Date: Fri, 15 Jul 2016 09:04:18 +0200 Subject: Collapsed diffs lines/size don't accumulate to overflow diffs. --- lib/gitlab/diff/file.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/gitlab/diff') diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 7e01f7b61fb..b09ca1fb8b0 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -5,7 +5,7 @@ module Gitlab delegate :new_file, :deleted_file, :renamed_file, :old_path, :new_path, :a_mode, :b_mode, - :submodule?, :too_large?, to: :diff, prefix: false + :submodule?, :too_large?, :collapsed?, to: :diff, prefix: false def initialize(diff, repository:, diff_refs: nil) @diff = diff @@ -68,10 +68,6 @@ module Gitlab @lines ||= Gitlab::Diff::Parser.new.parse(raw_diff.each_line).to_a end - def collapsed_by_default? - diff.diff.bytesize > 10240 # 10 KB - end - def highlighted_diff_lines @highlighted_diff_lines ||= Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight end -- cgit v1.2.3