diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-08 01:05:34 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-08 01:05:34 +0300 |
| commit | 5a8f727fd5400634a99eae82e7bac5e26cf36d4e (patch) | |
| tree | dde30050a8992e4ba0b5d3f0e98794d1f6089df8 /app/views/projects/diffs/_diffs.html.haml | |
| parent | d925aea9f388f8ca5c858e825e5303232fa16c1d (diff) | |
| parent | 86d238e4bda6424a79eb9d8ea7cfe41af714f49f (diff) | |
Merge branch 'master' into faster-diffs
# Conflicts:
# app/helpers/notes_helper.rb
# app/views/projects/diffs/_line.html.haml
# app/views/projects/diffs/_parallel_view.html.haml
# app/views/projects/diffs/_text_file.html.haml
# features/steps/shared/diff_note.rb
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 94f765a097c..2a15c306f07 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -2,7 +2,7 @@ - if diff_view == 'parallel' - fluid_layout true -- diff_files = safe_diff_files(diffs, diff_refs) +- diff_files = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository) .content-block.oneline-block.files-changed .inline-parallel-buttons @@ -24,7 +24,7 @@ .files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, @project))}} - 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) + - blob = diff_file.blob(diff_commit) - next unless blob - blob.load_all_data!(project.repository) unless blob.only_display_raw? |