summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-24 17:42:31 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-05-24 17:42:31 -0500
commitc6d1ce20fdca88179a08878d494ccc41afd0085c (patch)
tree0b5976e47cc959c98cfb1b4a0ea40550b1c190e7
parent829c6a63f78bb4953c15d16d2e7812dfd044901f (diff)
downloadgitlab-ce-c6d1ce20fdca88179a08878d494ccc41afd0085c.tar.gz
Fix hide whitespace changes button
-rw-r--r--app/views/projects/diffs/_diffs.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index dfb509ce7d8..077c6c68f7e 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -13,7 +13,7 @@
- if current_controller?(:commit)
= commit_diff_whitespace_link(diffs.project, @commit, class: 'd-none d-sm-inline-block')
- elsif current_controller?('projects/merge_requests/diffs')
- = diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'd-none d-sm-block')
+ = diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'd-none d-sm-inline-block')
- elsif current_controller?(:compare)
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'd-none d-sm-inline-block')
.btn-group