From d3067379a407ef04c7ba5823114e2cc541dc6860 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 11 Aug 2014 12:48:00 +0300
Subject: [PATCH] Fix project search showing always no results if no merge
requests matches
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/views/search/_project_results.html.haml | 4 ++--
1 file 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" }
--
GitLab