summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-03-23 11:10:17 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-04-26 14:01:40 -0500
commitd8d00b5bc29f7b89f95c436cd6900d1548f111b7 (patch)
tree4c90ee8317fa575909519bea5ea648dd4f1abd2e /app/views/projects/diffs
parent18e00e3ba316b464bd0a6a78ae0c2669afa15f5a (diff)
downloadgitlab-ce-d8d00b5bc29f7b89f95c436cd6900d1548f111b7.tar.gz
Add Hide/show whitespace changes button on diff and commit view
Diffstat (limited to 'app/views/projects/diffs')
-rw-r--r--app/views/projects/diffs/_diffs.html.haml4
1 files changed, 4 insertions, 0 deletions
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