From d8d00b5bc29f7b89f95c436cd6900d1548f111b7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 23 Mar 2016 11:10:17 -0500
Subject: Add Hide/show whitespace changes button on diff and commit view

---
 app/helpers/diff_helper.rb                | 22 ++++++++++++++++++++++
 app/views/projects/diffs/_diffs.html.haml |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 97466d532f4..eca4ba695a1 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -128,4 +128,26 @@ module DiffHelper
       title
     end
   end
+
+  def hide_whitespaces?
+    params[:w] == '1'
+  end
+
+  def params_with_whitespace
+    hide_whitespaces? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
+  end
+
+  def toggle_whitespace_link(url)
+    link_to "#{hide_whitespaces? ? 'Show' : 'Hide'} whitespace changes", url, class: "btn btn-default"
+  end
+
+  def commit_diff_whitespace_link(project, commit)
+    url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
+    toggle_whitespace_link(url)
+  end
+
+  def diff_merge_request_whitespace_link(project, merge_request)
+    url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
+    toggle_whitespace_link(url)
+  end
 end
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index eaab99973a4..fbfff9bc895 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -5,6 +5,10 @@
 
 .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)
     .btn-group
       = inline_diff_btn
       = parallel_diff_btn
-- 
cgit v1.2.1


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: Hide whitespace toggle button for new merge requests

---
 app/views/projects/diffs/_diffs.html.haml               | 10 ++++++----
 app/views/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 fbfff9bc895..6d2b85ed994 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 2f14a91e64f..18b3f9e1549 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"
-- 
cgit v1.2.1


From 473591403197c0b0fd985f4f01d59e6e31b57a60 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 4 Apr 2016 11:35:56 -0500
Subject: Update syntax

---
 app/views/projects/diffs/_diffs.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 6d2b85ed994..22adebd91e5 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -1,4 +1,4 @@
-- show_whitespace_toggle = local_assigns.fetch :show_whitespace_toggle, true
+- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
 - if diff_view == 'parallel'
   - fluid_layout true
 
@@ -9,7 +9,7 @@
     - if show_whitespace_toggle
       - if current_controller?(:commit)
         = commit_diff_whitespace_link(@project, @commit)
-      - if current_controller?(:merge_requests)
+      - elsif current_controller?(:merge_requests)
         = diff_merge_request_whitespace_link(@project, @merge_request)
     .btn-group
       = inline_diff_btn
-- 
cgit v1.2.1


From 64c2d9bd3ce5c3151dd14be01916a4a72a4abc55 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 4 Apr 2016 11:45:21 -0500
Subject: Use new method hide_whitespaces?

---
 app/helpers/diff_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index eca4ba695a1..2f80dc5ccc0 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -23,7 +23,7 @@ module DiffHelper
   end
 
   def diff_options
-    options = { ignore_whitespace_change: params[:w] == '1' }
+    options = { ignore_whitespace_change: hide_whitespaces? }
     if diff_hard_limit_enabled?
       options.merge!(Commit.max_diff_options)
     end
-- 
cgit v1.2.1


From 66a5d0fd266075f0362bb3ec9dea1a584d7c5c5f Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 4 Apr 2016 12:01:59 -0500
Subject: Rename method

---
 app/helpers/diff_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 2f80dc5ccc0..06e5b95297e 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -23,7 +23,7 @@ module DiffHelper
   end
 
   def diff_options
-    options = { ignore_whitespace_change: hide_whitespaces? }
+    options = { ignore_whitespace_change: hide_whitespace? }
     if diff_hard_limit_enabled?
       options.merge!(Commit.max_diff_options)
     end
@@ -129,16 +129,16 @@ module DiffHelper
     end
   end
 
-  def hide_whitespaces?
+  def hide_whitespace?
     params[:w] == '1'
   end
 
   def params_with_whitespace
-    hide_whitespaces? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
+    hide_whitespace? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
   end
 
   def toggle_whitespace_link(url)
-    link_to "#{hide_whitespaces? ? 'Show' : 'Hide'} whitespace changes", url, class: "btn btn-default"
+    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: "btn btn-default"
   end
 
   def commit_diff_whitespace_link(project, commit)
-- 
cgit v1.2.1


From a1a9a1cf8d26fc85598eb982a78720282055a96f Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 13:01:13 -0500
Subject: Specs for toggle Whitespaces Changes

---
 .../merge_requests/toggle_whitespace_changes.rb    | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 spec/features/merge_requests/toggle_whitespace_changes.rb

diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
new file mode 100644
index 00000000000..85b8d6975fc
--- /dev/null
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+feature 'Toggle Whitespace Changes', js: true, feature: true do
+  let(:merge_request) { create(:merge_request) }
+  let(:project) { merge_request.source_project }
+
+  before do
+    login_as :admin
+    visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
+  end
+
+  it 'should have a button to toggle whitespace changes' do
+    expect(page).to have_content "Hide whitespace changes"
+  end
+
+  describe 'clicking hide whitespace changes button' do
+    it 'should hide whitespace changes' do
+      find('a', text: "Hide whitespace changes").click
+      expect(page).to have_content "Show whitespace changes"
+    end
+  end
+end
-- 
cgit v1.2.1


From 5d5df26ab1b65b094eaa2ca2ca6db49b6d8530ea Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 16:09:49 -0500
Subject: Add documentation for "Hide whitespace changes" button

---
 doc/workflow/merge_requests.md                     |   6 +++---
 doc/workflow/merge_requests/commit_compare.png     | Bin 89631 -> 110376 bytes
 doc/workflow/merge_requests/merge_request_diff.png | Bin 120422 -> 166226 bytes
 .../merge_request_diff_without_whitespace.png      | Bin 98887 -> 121476 bytes
 .../merge_requests/toggle_whitespace_changes.rb    |   2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 6d57b5d98cd..3a47838e977 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -12,9 +12,9 @@ Locate the section for your GitLab remote in the `.git/config` file. It looks li
   fetch = +refs/heads/*:refs/remotes/origin/*
 ```
 
-Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section. 
+Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section.
 
-It should looks like this: 
+It should look like this:
 
 ```
 [remote "origin"]
@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1
 
 ![MR diff](merge_requests/merge_request_diff.png)
 
-It you add `w=1` option to URL, you can see diff without whitespace changes.
+If you click to "Hide whitespace changes" button, you can see diff without whitespace changes.
 
 ![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)
 
diff --git a/doc/workflow/merge_requests/commit_compare.png b/doc/workflow/merge_requests/commit_compare.png
index 46b3a56a59b..dfd7ee220f0 100644
Binary files a/doc/workflow/merge_requests/commit_compare.png and b/doc/workflow/merge_requests/commit_compare.png differ
diff --git a/doc/workflow/merge_requests/merge_request_diff.png b/doc/workflow/merge_requests/merge_request_diff.png
index ed08ae91bec..f368423c746 100644
Binary files a/doc/workflow/merge_requests/merge_request_diff.png and b/doc/workflow/merge_requests/merge_request_diff.png differ
diff --git a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png
index 67d67a64d12..b2d03bb66f9 100644
Binary files a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png and b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png differ
diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index 85b8d6975fc..1d7981d9fb5 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -13,7 +13,7 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
     expect(page).to have_content "Hide whitespace changes"
   end
 
-  describe 'clicking hide whitespace changes button' do
+  describe 'clicking "Hide whitespace changes" button' do
     it 'should hide whitespace changes' do
       find('a', text: "Hide whitespace changes").click
       expect(page).to have_content "Show whitespace changes"
-- 
cgit v1.2.1


From 89df29e09f1ed31e9d2b0b8c1791be41641da04d Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 12:52:54 -0500
Subject: Use click_link

---
 spec/features/merge_requests/toggle_whitespace_changes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index 1d7981d9fb5..a3c02e6c55a 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -15,7 +15,7 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
 
   describe 'clicking "Hide whitespace changes" button' do
     it 'should hide whitespace changes' do
-      find('a', text: "Hide whitespace changes").click
+      click_link "Hide whitespace changes"
       expect(page).to have_content "Show whitespace changes"
     end
   end
-- 
cgit v1.2.1


From 0392dffdb64ff70f299a1f41c6a68c202bfb8068 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 12:57:51 -0500
Subject: Update wording

---
 doc/workflow/merge_requests.md                            | 2 +-
 spec/features/merge_requests/toggle_whitespace_changes.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 3a47838e977..1b5718c91c1 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1
 
 ![MR diff](merge_requests/merge_request_diff.png)
 
-If you click to "Hide whitespace changes" button, you can see diff without whitespace changes.
+If you click the "Hide whitespace changes" button, you can see the diff without whitespace changes.
 
 ![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)
 
diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index a3c02e6c55a..cfae3fa131d 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -9,12 +9,12 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
     visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
   end
 
-  it 'should have a button to toggle whitespace changes' do
+  it 'has a button to toggle whitespace changes' do
     expect(page).to have_content "Hide whitespace changes"
   end
 
   describe 'clicking "Hide whitespace changes" button' do
-    it 'should hide whitespace changes' do
+    it 'toggles the "Hide whitespace changes" button' do
       click_link "Hide whitespace changes"
       expect(page).to have_content "Show whitespace changes"
     end
-- 
cgit v1.2.1


From 7f263ca1de525e44bea1f97a22d95ad947848128 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 13:15:28 -0500
Subject: Use variables instead of let

---
 spec/features/merge_requests/toggle_whitespace_changes.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index cfae3fa131d..bf4fd5289d1 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 feature 'Toggle Whitespace Changes', js: true, feature: true do
-  let(:merge_request) { create(:merge_request) }
-  let(:project) { merge_request.source_project }
-
   before do
     login_as :admin
+    merge_request = create(:merge_request)
+    project = merge_request.source_project
     visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
   end
 
-- 
cgit v1.2.1


From 5ba79f49a45041f5a805de00a1f737ade5ac5832 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 12 Apr 2016 12:49:34 -0500
Subject: Syntax and code improvements

---
 app/helpers/diff_helper.rb                         | 24 ++++++++++++----------
 .../merge_requests/toggle_whitespace_changes.rb    |  7 ++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 06e5b95297e..5c7317bdd40 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -129,6 +129,18 @@ module DiffHelper
     end
   end
 
+  def commit_diff_whitespace_link(project, commit)
+    url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
+    toggle_whitespace_link(url)
+  end
+
+  def diff_merge_request_whitespace_link(project, merge_request)
+    url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
+    toggle_whitespace_link(url)
+  end
+
+  private
+
   def hide_whitespace?
     params[:w] == '1'
   end
@@ -138,16 +150,6 @@ module DiffHelper
   end
 
   def toggle_whitespace_link(url)
-    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: "btn btn-default"
-  end
-
-  def commit_diff_whitespace_link(project, commit)
-    url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
-    toggle_whitespace_link(url)
-  end
-
-  def diff_merge_request_whitespace_link(project, merge_request)
-    url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
-    toggle_whitespace_link(url)
+    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: 'btn btn-default'
   end
 end
diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb
index bf4fd5289d1..0f98737b700 100644
--- a/spec/features/merge_requests/toggle_whitespace_changes.rb
+++ b/spec/features/merge_requests/toggle_whitespace_changes.rb
@@ -9,13 +9,14 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
   end
 
   it 'has a button to toggle whitespace changes' do
-    expect(page).to have_content "Hide whitespace changes"
+    expect(page).to have_content 'Hide whitespace changes'
   end
 
   describe 'clicking "Hide whitespace changes" button' do
     it 'toggles the "Hide whitespace changes" button' do
-      click_link "Hide whitespace changes"
-      expect(page).to have_content "Show whitespace changes"
+      click_link 'Hide whitespace changes'
+
+      expect(page).to have_content 'Show whitespace changes'
     end
   end
 end
-- 
cgit v1.2.1


From b82af5ef2f5c496751411a4c1a1be0c9cacd19b4 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 12 Apr 2016 12:57:15 -0500
Subject: Update CHANGELOG

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index af259b67d50..8dff81166c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -137,6 +137,7 @@ v 8.6.7
   - Fix persistent XSS vulnerability in `commit_person_link` helper
   - Fix persistent XSS vulnerability in Label and Milestone dropdowns
   - Fix vulnerability that made it possible to enumerate private projects belonging to group
+  - Added button to toggle whitespaces changes on diff view
 
 v 8.6.6
   - Expire the exists cache before deletion to ensure project dir actually exists (Stan Hu). !3413
-- 
cgit v1.2.1


From 99296b2efdb92ddf484e27ea3b8af4b058ea5911 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 18 Apr 2016 16:45:14 -0500
Subject: Hide button on mobile

---
 app/helpers/diff_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 5c7317bdd40..d78b0b5a155 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -150,6 +150,6 @@ module DiffHelper
   end
 
   def toggle_whitespace_link(url)
-    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: 'btn btn-default'
+    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: 'btn btn-default hidden-xs'
   end
 end
-- 
cgit v1.2.1


From 22bd7f4d83a255e3e23d3e421fbb1a56f0c67394 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 18 Apr 2016 16:51:30 -0500
Subject: Allow to pass custom classes to button

---
 app/helpers/diff_helper.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index d78b0b5a155..9f73edb4553 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -129,14 +129,14 @@ module DiffHelper
     end
   end
 
-  def commit_diff_whitespace_link(project, commit)
+  def commit_diff_whitespace_link(project, commit, options)
     url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
-    toggle_whitespace_link(url)
+    toggle_whitespace_link(url, options)
   end
 
-  def diff_merge_request_whitespace_link(project, merge_request)
+  def diff_merge_request_whitespace_link(project, merge_request, options)
     url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
-    toggle_whitespace_link(url)
+    toggle_whitespace_link(url, options)
   end
 
   private
@@ -149,7 +149,10 @@ module DiffHelper
     hide_whitespace? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
   end
 
-  def toggle_whitespace_link(url)
-    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: 'btn btn-default hidden-xs'
+  def toggle_whitespace_link(url, options)
+    options[:class] ||= ''
+    options[:class] << ' btn btn-default'
+
+    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: options[:class]
   end
 end
-- 
cgit v1.2.1


From 4d6c40df9a928054e3d1c6d6c477f3a35fa950f6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 18 Apr 2016 16:51:41 -0500
Subject: Hide button on mobile

---
 app/views/projects/diffs/_diffs.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 22adebd91e5..d9c4b410d32 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -8,9 +8,9 @@
   .inline-parallel-buttons
     - if show_whitespace_toggle
       - if current_controller?(:commit)
-        = commit_diff_whitespace_link(@project, @commit)
+        = commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')
       - elsif current_controller?(:merge_requests)
-        = diff_merge_request_whitespace_link(@project, @merge_request)
+        = diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')
     .btn-group
       = inline_diff_btn
       = parallel_diff_btn
-- 
cgit v1.2.1


From c98b25f420cafd8a9abc7148035aff04f672b330 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 25 Apr 2016 14:18:36 -0500
Subject: Update CHANGELOG

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 8dff81166c3..0df5bb2de58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.8.0 (unreleased)
   - Updated search UI
   - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
+  - Added button to toggle whitespaces changes on diff view
 
 v 8.7.1 (unreleased)
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848
-- 
cgit v1.2.1


From 19d8f6731a3e3912d880cfeacf0a82f5aea65f34 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 18:58:11 +0000
Subject: Update CHANGELOG

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0df5bb2de58..e52e52691c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -138,7 +138,6 @@ v 8.6.7
   - Fix persistent XSS vulnerability in `commit_person_link` helper
   - Fix persistent XSS vulnerability in Label and Milestone dropdowns
   - Fix vulnerability that made it possible to enumerate private projects belonging to group
-  - Added button to toggle whitespaces changes on diff view
 
 v 8.6.6
   - Expire the exists cache before deletion to ensure project dir actually exists (Stan Hu). !3413
-- 
cgit v1.2.1