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
2019-05-30 09:35:11 +00:00 · 2019-05-30 09:35:11 +00:00 · c8b4edf651
parent 3a50fc5d19 102041ac0a
commit c8b4edf651
2 changed files with 6 additions and 0 deletions
--- a/app/views/search/_form.html.haml
+++ b/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'
--- a/changelogs/unreleased/ee-11040-added-conditional-rendering.yml
+++ b/changelogs/unreleased/ee-11040-added-conditional-rendering.yml
@ -0,0 +1,5 @@
+---
+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