Commit f0bdf5c6 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Hide whitespace toggle button for new merge requests

parent d8d00b5b
- show_whitespace_toggle = local_assigns.fetch :show_whitespace_toggle, true
- if diff_view == 'parallel' - if diff_view == 'parallel'
- fluid_layout true - fluid_layout true
...@@ -5,10 +6,11 @@ ...@@ -5,10 +6,11 @@
.content-block.oneline-block.files-changed .content-block.oneline-block.files-changed
.inline-parallel-buttons .inline-parallel-buttons
- if current_controller?(:commit) - if show_whitespace_toggle
= commit_diff_whitespace_link(@project, @commit) - if current_controller?(:commit)
- if current_controller?(:merge_requests) = commit_diff_whitespace_link(@project, @commit)
= diff_merge_request_whitespace_link(@project, @merge_request) - if current_controller?(:merge_requests)
= diff_merge_request_whitespace_link(@project, @merge_request)
.btn-group .btn-group
= inline_diff_btn = inline_diff_btn
= parallel_diff_btn = parallel_diff_btn
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits. %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
%p To preserve performance the line changes are not shown. %p To preserve performance the line changes are not shown.
- else - else
= render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @merge_request.diff_refs = render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @merge_request.diff_refs, show_whitespace_toggle: false
- if @ci_commit - if @ci_commit
#builds.builds.tab-pane #builds.builds.tab-pane
= render "projects/merge_requests/show/builds" = render "projects/merge_requests/show/builds"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment