2016-06-02 11:05:42 +05:30
|
|
|
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
|
2015-11-26 14:37:03 +05:30
|
|
|
- if diff_view == 'parallel'
|
2015-09-25 12:07:36 +05:30
|
|
|
- fluid_layout true
|
|
|
|
|
|
2016-01-29 22:53:50 +05:30
|
|
|
- diff_files = safe_diff_files(diffs, diff_refs)
|
2015-10-24 18:46:33 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
.content-block.oneline-block.files-changed
|
2015-09-25 12:07:36 +05:30
|
|
|
.inline-parallel-buttons
|
2016-06-02 11:05:42 +05:30
|
|
|
- if show_whitespace_toggle
|
|
|
|
|
- if current_controller?(:commit)
|
|
|
|
|
= commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')
|
|
|
|
|
- elsif current_controller?(:merge_requests)
|
|
|
|
|
= diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')
|
2015-04-26 12:48:37 +05:30
|
|
|
.btn-group
|
|
|
|
|
= inline_diff_btn
|
|
|
|
|
= parallel_diff_btn
|
2015-10-24 18:46:33 +05:30
|
|
|
= render 'projects/diffs/stats', diff_files: diff_files
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
- if diff_files.overflow?
|
|
|
|
|
= render 'projects/diffs/warning', diff_files: diff_files
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
|
.files
|
2015-09-11 14:41:01 +05:30
|
|
|
- diff_files.each_with_index do |diff_file, index|
|
2015-10-24 18:46:33 +05:30
|
|
|
- diff_commit = commit_for_diff(diff_file)
|
|
|
|
|
- blob = project.repository.blob_for_diff(diff_commit, diff_file)
|
|
|
|
|
- next unless blob
|
2016-06-16 23:09:34 +05:30
|
|
|
- blob.load_all_data!(project.repository) unless blob.only_display_raw?
|
2015-10-24 18:46:33 +05:30
|
|
|
|
|
|
|
|
= render 'projects/diffs/file', i: index, project: project,
|
2016-06-02 11:05:42 +05:30
|
|
|
diff_file: diff_file, diff_commit: diff_commit, blob: blob, diff_refs: diff_refs
|
