Commit 33265ea3 authored by Phil Hughes's avatar Phil Hughes

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
parents 99079548 0822f192
- if @search_objects.to_a.empty? - if @search_objects.to_a.empty?
= render partial: "search/results/empty" = render partial: "search/results/empty"
= render_if_exists 'shared/promotions/promote_advanced_search'
- else - else
.row-content-block .row-content-block
- unless @search_objects.is_a?(Kaminari::PaginatableWithoutCount) - unless @search_objects.is_a?(Kaminari::PaginatableWithoutCount)
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
- elsif @group - elsif @group
- link_to_group = link_to(@group.name, @group) - link_to_group = link_to(@group.name, @group)
= _("in group %{link_to_group}").html_safe % { link_to_group: link_to_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 .results.prepend-top-10
- if @scope == 'commits' - if @scope == 'commits'
%ul.content-list.commit-list %ul.content-list.commit-list
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment