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

move EE-specific code to subtemplate

Closes #11039

See merge request gitlab-org/gitlab-ee!14080

app/views/search/_category.html.haml

@@ -87,20 +87,5 @@
           = _("Milestones")
           %span.badge.badge-pill
             = limited_count(@search_results.limited_milestones_count)
-      - if search_service.use_elasticsearch?
-        %li{ class: active_when(@scope == 'blobs') }
-          = link_to search_filter_path(scope: 'blobs') do
-            = _("Code")
-            %span.badge.badge-pill
-              = limited_count(@search_results.blobs_count)
-        %li{ class: active_when(@scope == 'commits') }
-          = link_to search_filter_path(scope: 'commits') do
-            = _("Commits")
-            %span.badge.badge-pill
-              = limited_count(@search_results.commits_count)
-        %li{ class: active_when(@scope == 'wiki_blobs') }
-          = link_to search_filter_path(scope: 'wiki_blobs') do
-            = _("Wiki")
-            %span.badge.badge-pill
-              = limited_count(@search_results.wiki_blobs_count)
+      = render_if_exists 'search/category_elasticsearch'
       = users

changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml

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

ee/app/views/search/_category_elasticsearch.html.haml

+- if search_service.use_elasticsearch?
+  %li{ class: active_when(@scope == 'blobs') }
+    = link_to search_filter_path(scope: 'blobs') do
+      = _("Code")
+      %span.badge.badge-pill
+        = limited_count(@search_results.blobs_count)
+  %li{ class: active_when(@scope == 'commits') }
+    = link_to search_filter_path(scope: 'commits') do
+      = _("Commits")
+      %span.badge.badge-pill
+        = limited_count(@search_results.commits_count)
+  %li{ class: active_when(@scope == 'wiki_blobs') }
+    = link_to search_filter_path(scope: 'wiki_blobs') do
+      = _("Wiki")
+      %span.badge.badge-pill
+        = limited_count(@search_results.wiki_blobs_count)