diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:38:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:38:38 +0000 |
| commit | c1174901c67f76a10f5a07ce3990af00ca1e0b05 (patch) | |
| tree | 165476525fdb91309c2634505493766a836adffe /app/models | |
| parent | 5354c29352416a606f16c58e65bfbafebfa1ef3c (diff) | |
| parent | 3107f2e460d8db35f7ddd0cc5f68575233bfc133 (diff) | |
| download | gitlab-ce-c1174901c67f76a10f5a07ce3990af00ca1e0b05.tar.gz | |
Merge branch 'deltas-only' into 'master'
Don't use DiffCollection for deltas
See merge request !11201
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 9359b323ed4..dea18bfedef 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -336,6 +336,8 @@ class Commit end end + delegate :deltas, to: :raw, prefix: :raw + def diffs(diff_options = nil) Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options) end @@ -373,7 +375,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 |