diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 18:54:53 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-06 18:50:58 -0400 |
| commit | 9fc0e11e0dbd541c8c0bca60878178ca94ad34e1 (patch) | |
| tree | 4ecdb99f6c0247ec8d51eaa1d85aba470a3c890b /app/views/projects/diffs/_diffs.html.haml | |
| parent | 17ab745e40bf89776ab16de9ba00ebb44d1c85ca (diff) | |
| download | gitlab-ce-9fc0e11e0dbd541c8c0bca60878178ca94ad34e1.tar.gz | |
Add DiffFile#blob and #old_blob
Diffstat (limited to 'app/views/projects/diffs/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 151780addc5..8f252282692 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -23,8 +23,8 @@ .files - diff_files.each_with_index do |diff_file, index| - - diff_commit = commit_for_diff(diff_file) - - blob = project.repository.blob_for_diff(diff_commit, diff_file) + - diff_commit = diff_file.content_commit || commit_for_diff(diff_file) + - blob = diff_file.blob(diff_commit) - next unless blob - blob.load_all_data!(project.repository) unless blob.only_display_raw? |