summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-13 17:28:14 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-13 17:28:14 +0000
commit31d9f655531f22abd8bbbc66afc9affd48d76220 (patch)
treebddbc7c01824fc17f950b99694ee7abef13d17c5
parentd7c7f54634ba0abf66408778318d9597d33aaa5c (diff)
parentd88d6e7619c3f976361df638e765472b499f1986 (diff)
downloadgitlab-ce-31d9f655531f22abd8bbbc66afc9affd48d76220.tar.gz
Merge branch 'issue_14771' into 'master'
Hide top search form on the search page Closes #14771 ![Screen_Shot_2016-04-11_at_6.04.19_PM](/uploads/44cf2110bad29c0df06d874740a3a61f/Screen_Shot_2016-04-11_at_6.04.19_PM.png) See merge request !3668
-rw-r--r--app/views/layouts/header/_default.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 44339293095..3beb8ff7c0d 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -8,7 +8,7 @@
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li.hidden-sm.hidden-xs
- = render 'layouts/search'
+ = render 'layouts/search' unless current_controller?(:search)
%li.visible-sm.visible-xs
= link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('search')