From f0bdf5c692fbfe7623eda509f17fe34f7424f141 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 29 Mar 2016 16:13:39 -0500
Subject: [PATCH] Hide whitespace toggle button for new merge requests

---
 app/views/projects/diffs/_diffs.html.haml              | 10 ++++++----
 .../projects/merge_requests/_new_submit.html.haml      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index fbfff9bc89..6d2b85ed99 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -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
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 2f14a91e64..18b3f9e154 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -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"