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/models/repository.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/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 921e1a9e426..e2d4f74407f 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -312,13 +312,7 @@ class Repository end def blob_for_diff(commit, diff) - file = blob_at(commit.id, diff.new_path) - - unless file - file = prev_blob_for_diff(commit, diff) - end - - file + blob_at(commit.id, diff.file_path) end def prev_blob_for_diff(commit, diff) |