2016-06-02 11:05:42 +05:30
|
|
|
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
|
2016-09-13 17:45:13 +05:30
|
|
|
- diff_files = diffs.diff_files
|
|
|
|
- if diff_view == :parallel
|
2015-09-25 12:07:36 +05:30
|
|
|
- fluid_layout true
|
|
|
|
|
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-08-24 12:49:21 +05:30
|
|
|
- if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? }
|
|
|
|
= link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: nil)), class: 'btn btn-default'
|
2016-06-02 11:05:42 +05:30
|
|
|
- if show_whitespace_toggle
|
|
|
|
- if current_controller?(:commit)
|
2016-09-13 17:45:13 +05:30
|
|
|
= commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
|
2016-06-02 11:05:42 +05:30
|
|
|
- elsif current_controller?(:merge_requests)
|
2016-09-13 17:45:13 +05:30
|
|
|
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
|
2016-06-22 15:30:34 +05:30
|
|
|
- elsif current_controller?(:compare)
|
2016-09-13 17:45:13 +05:30
|
|
|
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], 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
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
.files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, diffs.project))}}
|
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)
|
2016-08-24 12:49:21 +05:30
|
|
|
- blob = diff_file.blob(diff_commit)
|
2015-10-24 18:46:33 +05:30
|
|
|
- next unless blob
|
2016-09-13 17:45:13 +05:30
|
|
|
- blob.load_all_data!(diffs.project.repository) unless blob.only_display_raw?
|
2015-10-24 18:46:33 +05:30
|
|
|
|
2016-09-13 17:45:13 +05:30
|
|
|
= render 'projects/diffs/file', index: index, project: diffs.project,
|
|
|
|
diff_file: diff_file, diff_commit: diff_commit, blob: blob
|