5d16d50ceb
Toggle whitespace button for compare page ## What does this MR do? Adds whitespace button to compare branches page. ## Are there points in the code the reviewer needs to double check? Ruby code. ## Why was this MR needed? Compare branches UX ## What are the relevant issue numbers? Closes #17881. ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4569
32 lines
1.3 KiB
Text
32 lines
1.3 KiB
Text
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
|
|
- if diff_view == 'parallel'
|
|
- fluid_layout true
|
|
|
|
- diff_files = safe_diff_files(diffs, diff_refs)
|
|
|
|
.content-block.oneline-block.files-changed
|
|
.inline-parallel-buttons
|
|
- 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')
|
|
- elsif current_controller?(:compare)
|
|
= diff_compare_whitespace_link(@project, params[:from], params[:to], class: 'hidden-xs')
|
|
.btn-group
|
|
= inline_diff_btn
|
|
= parallel_diff_btn
|
|
= render 'projects/diffs/stats', diff_files: diff_files
|
|
|
|
- if diff_files.overflow?
|
|
= render 'projects/diffs/warning', diff_files: diff_files
|
|
|
|
.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)
|
|
- next unless blob
|
|
- blob.load_all_data!(project.repository) unless blob.only_display_raw?
|
|
|
|
= render 'projects/diffs/file', i: index, project: project,
|
|
diff_file: diff_file, diff_commit: diff_commit, blob: blob, diff_refs: diff_refs
|