summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-06 22:55:15 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-06 22:55:15 +0000
commit7c6c933c9f7d52b7b78ce5f9656c65fb65d64f35 (patch)
treed5197dbb5db28f840b64140e4072dcaf5ad5accb
parentd2f7813078b2a2adc81bee594ed9cfab578e812b (diff)
parentbfcee4a51d8cd7cecd7a63e52f13979a436a458e (diff)
downloadgitlab-ce-7c6c933c9f7d52b7b78ce5f9656c65fb65d64f35.tar.gz
Merge branch 'issue_14952' into 'master'
Do not add location badge when creating a group or project Closes #14952 ![](/uploads/778d0cbccffc717d601a91528ca8eb3c/Screen_Shot_2016-04-05_at_5.34.10_PM.png) ![](/uploads/dbd9eb06b510a6ac091dcf2e3fcb9c88/Screen_Shot_2016-04-05_at_5.34.21_PM.png) See merge request !3555
-rw-r--r--app/views/layouts/_search.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index ba04bd74b8d..6b208c3d0bb 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -1,6 +1,6 @@
-- if controller.controller_path =~ /^groups/
+- if controller.controller_path =~ /^groups/ && @group.persisted?
- label = 'This group'
-- if controller.controller_path =~ /^projects/
+- if controller.controller_path =~ /^projects/ && @project.persisted?
- label = 'This project'
.search.search-form{class: "#{'has-location-badge' if label.present?}"}