diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-03 07:33:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-03 07:33:06 +0000 |
| commit | 33265ea368d2af255d6289eaf764c9724269397e (patch) | |
| tree | 66dac378f71c601759289d2106676d1767ce7f59 | |
| parent | 9907954897e3f7a56c71bd4860a411d3a66c1f86 (diff) | |
| parent | 0822f192f9490a45d1204fb02ec0171d7fb06ee2 (diff) | |
| download | gitlab-ce-33265ea368d2af255d6289eaf764c9724269397e.tar.gz | |
Merge branch '11041-move-ee-differences-for-app-views-search-_results-html-haml' into 'master'
CE: Resolve EE differences in search/_results.html.haml
See merge request gitlab-org/gitlab-ce!28952
| -rw-r--r-- | app/views/search/_results.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 8ae2807729b..cb8a8a24be8 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -1,5 +1,6 @@ - if @search_objects.to_a.empty? = render partial: "search/results/empty" + = render_if_exists 'shared/promotions/promote_advanced_search' - else .row-content-block - unless @search_objects.is_a?(Kaminari::PaginatableWithoutCount) @@ -11,7 +12,7 @@ - elsif @group - link_to_group = link_to(@group.name, @group) = _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group } - + = render_if_exists 'shared/promotions/promote_advanced_search' .results.prepend-top-10 - if @scope == 'commits' %ul.content-list.commit-list |