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

Moved EE-specific code in `app/view/search/_form.html.haml`

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

app/views/search/_form.html.haml

@@ -13,7 +13,4 @@
     - unless params[:snippets].eql? 'true'
       = render 'filter'
     = button_tag _("Search"), class: "btn btn-success btn-search"
-  - if search_service.use_elasticsearch?
-    .form-text.text-muted
-      = link_to _('Advanced search functionality'), help_page_path('user/search/advanced_search_syntax.md'), target: '_blank'
-      is enabled.
+    = render_if_exists 'search/form_elasticsearch'

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

+- if search_service.use_elasticsearch?
+  .form-text.text-muted
+    = link_to _('Advanced search functionality'), help_page_path('user/search/advanced_search_syntax.md'), target: '_blank'
+    is enabled.

ee/changelogs/unreleased-ee/11040-moved-ee-specific-code-to-subtemplate.yml

+---
+title: "Moved EE-specific code in `app/view/search/_form.html.haml` to subtemplate"
+merge_request: 13578
+author: Michel Engelen
+type: other