home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Hide whitespace toggle button for new merge requests

Browse Source
This commit is contained in:
Alfredo Sumaran
2016-04-26 14:01:40 -05:00
parent d8d00b5bc2
commit f0bdf5c692
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/diffs/_diffs.html.haml
+6 -4
View File
@@ -1,3 +1,4 @@
- show_whitespace_toggle = local_assigns.fetch :show_whitespace_toggle, true
- if diff_view == 'parallel'
- fluid_layout true
@@ -5,10 +6,11 @@
.content-block.oneline-block.files-changed
.inline-parallel-buttons
- if current_controller?(:commit)
= commit_diff_whitespace_link(@project, @commit)
- if current_controller?(:merge_requests)
= diff_merge_request_whitespace_link(@project, @merge_request)
- if show_whitespace_toggle
- if current_controller?(:commit)
= commit_diff_whitespace_link(@project, @commit)
- if current_controller?(:merge_requests)
= diff_merge_request_whitespace_link(@project, @merge_request)
.btn-group
= inline_diff_btn
= parallel_diff_btn
app/views/projects/merge_requests/_new_submit.html.haml
+1 -1
View File
@@ -42,7 +42,7 @@
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
%p To preserve performance the line changes are not shown.
- 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
#builds.builds.tab-pane
= render "projects/merge_requests/show/builds"