Merge branch 'issue/11040' into 'master'

Backport of EE change in `app/views/search/_form.html.haml`

See merge request gitlab-org/gitlab-ce!28883

app/views/search/_form.html.haml

@@ -13,3 +13,4 @@
     - unless params[:snippets].eql? 'true'
       = render 'filter'
     = button_tag _("Search"), class: "btn btn-success btn-search"
+    = render_if_exists 'search/form_elasticsearch'

changelogs/unreleased/ee-11040-added-conditional-rendering.yml

+---
+title: "Added conditional rendering to `app/views/search/_form.html.haml` for CE/EE code base consistency"
+merge_request: 28883
+author: Michel Engelen
+type: other