Merge branch 'ee-issue/11039' into 'master'

added code difference in `app/views/search/_category.html.haml` from EE to CE

See merge request gitlab-org/gitlab-ce!28755
This commit is contained in:
Filipa Lacerda 2019-06-28 11:16:46 +00:00
commit 046527beb5
2 changed files with 6 additions and 0 deletions

View File

@ -87,4 +87,5 @@
= _("Milestones")
%span.badge.badge-pill
= limited_count(@search_results.limited_milestones_count)
= render_if_exists 'search/category_elasticsearch'
= users

View File

@ -0,0 +1,5 @@
---
title: "Moved EE/CE code differences for file `app/views/search/_category.html.haml` into CE"
merge_request: 28755
author: Michel Engelen
type: other