Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-11 13:48:00 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-11 13:48:00 +0400
commitd3067379a407ef04c7ba5823114e2cc541dc6860 (patch)
tree0fd6d194c21040c3a063e6a972ebdd2a2301bffc /app
parentbdb9340e4d0fc0badb5202a5c910be8cdf2ba180 (diff)
Fix project search showing always no results if no merge requests matches
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/views/search/_project_results.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/_project_results.html.haml b/app/views/search/_project_results.html.haml
index 751824dce4a..5e8346a8262 100644
--- a/app/views/search/_project_results.html.haml
+++ b/app/views/search/_project_results.html.haml
@@ -15,10 +15,10 @@
- else
= render partial: "search/results/empty", :locals => { message: "We couldn't find any matching code" }
- else
- - if (@search_results[:merge_requests] || @search_results[:issues] || @search_results[:notes]).length > 0
+ - if @search_results[:merge_requests].present? || @search_results[:issues].present? || @search_results[:notes].present?
%ul.bordered-list
= render partial: "search/results/merge_request", collection: @search_results[:merge_requests]
= render partial: "search/results/issue", collection: @search_results[:issues]
= render partial: "search/results/note", collection: @search_results[:notes]
- else
- = render partial: "search/results/empty", :locals => { message: "We couldn't find any issues, merge requests or notes" }
+ = render partial: "search/results/empty", locals: { message: "We couldn't find any issues, merge requests or notes" }