2016-04-04 16:35:56 +00:00
|
|
|
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
|
2015-11-17 15:08:58 +00:00
|
|
|
- if diff_view == 'parallel'
|
2015-08-26 09:51:28 +00:00
|
|
|
- fluid_layout true
|
|
|
|
|
2016-06-20 16:51:48 +00:00
|
|
|
- diff_files = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository)
|
2015-10-01 11:52:08 +00:00
|
|
|
|
2016-04-07 19:36:53 +00:00
|
|
|
.content-block.oneline-block.files-changed
|
2015-09-08 15:22:26 +00:00
|
|
|
.inline-parallel-buttons
|
2016-03-29 21:13:39 +00:00
|
|
|
- if show_whitespace_toggle
|
|
|
|
- if current_controller?(:commit)
|
2016-04-18 21:51:41 +00:00
|
|
|
= commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')
|
2016-04-04 16:35:56 +00:00
|
|
|
- elsif current_controller?(:merge_requests)
|
2016-04-18 21:51:41 +00:00
|
|
|
= diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')
|
2016-06-09 17:26:14 +00:00
|
|
|
- elsif current_controller?(:compare)
|
|
|
|
= diff_compare_whitespace_link(@project, params[:from], params[:to], class: 'hidden-xs')
|
2015-03-25 02:00:00 +00:00
|
|
|
.btn-group
|
2014-12-25 12:32:49 +00:00
|
|
|
= inline_diff_btn
|
|
|
|
= parallel_diff_btn
|
2015-10-01 13:51:28 +00:00
|
|
|
= render 'projects/diffs/stats', diff_files: diff_files
|
2015-04-27 16:06:51 +00:00
|
|
|
|
2016-03-03 17:38:44 +00:00
|
|
|
- if diff_files.overflow?
|
|
|
|
= render 'projects/diffs/warning', diff_files: diff_files
|
2014-09-08 13:26:49 +00:00
|
|
|
|
|
|
|
.files
|
2015-04-27 16:06:51 +00:00
|
|
|
- diff_files.each_with_index do |diff_file, index|
|
2016-06-20 16:54:53 +00:00
|
|
|
- diff_commit = diff_file.content_commit || commit_for_diff(diff_file)
|
|
|
|
- blob = diff_file.blob(diff_commit)
|
2015-09-30 10:31:02 +00:00
|
|
|
- next unless blob
|
2016-05-24 05:59:35 +00:00
|
|
|
- blob.load_all_data!(project.repository) unless blob.only_display_raw?
|
2015-09-30 10:31:02 +00:00
|
|
|
|
|
|
|
= render 'projects/diffs/file', i: index, project: project,
|
2016-03-18 13:12:19 +00:00
|
|
|
diff_file: diff_file, diff_commit: diff_commit, blob: blob, diff_refs: diff_refs
|