diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-20 14:23:56 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-20 14:24:02 +0200 |
| commit | 8710739e4e5d12ac9e2aa88a553cc1e02dc2b2d1 (patch) | |
| tree | 0a632f67e2f9db6a0efcec32a86192e34b83385b /app/helpers/diff_helper.rb | |
| parent | 904c11ef912145e81f46133927f28c88971162ba (diff) | |
| download | gitlab-ce-8710739e4e5d12ac9e2aa88a553cc1e02dc2b2d1.tar.gz | |
Correctly find last known blob for file deleted in MR.merge-request-deleted-file
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index b896fba3704..e65e37211c4 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -170,7 +170,8 @@ module DiffHelper def commit_for_diff(diff) if diff.deleted_file - @merge_request ? @merge_request.commits.last : @commit.parents.first + first_commit = @first_commit || @commit + first_commit.parent else @commit end |