From 48254d187f421dfeb85a84bf2b86399add6e6a67 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 9 May 2017 12:27:17 +0200 Subject: Don't use DiffCollection for deltas --- app/models/commit.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index 9359b323ed4..e1da8e75c0c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -373,7 +373,7 @@ class Commit def repo_changes changes = { added: [], modified: [], removed: [] } - raw_diffs(deltas_only: true).each do |diff| + raw_deltas.each do |diff| if diff.deleted_file changes[:removed] << diff.old_path elsif diff.renamed_file || diff.new_file @@ -386,6 +386,10 @@ class Commit changes end + def raw_deltas + raw.deltas + end + def merged_merge_request?(user) !!merged_merge_request(user) end -- cgit v1.2.1