diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2017-05-09 13:27:17 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-05-09 13:27:17 +0300 |
commit | 48254d187f421dfeb85a84bf2b86399add6e6a67 (patch) | |
tree | 1c816bf6defc73c0a50f0a287367e9518a0b0a02 /app/models/commit.rb | |
parent | 62b0eb2c0ba02d2a9c9515722dfcb7ec61b7fc6a (diff) |
Don't use DiffCollection for deltas
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |