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

102041ac · Michel Engelen · Filipa Lacerda · 3a50fc5d · 102041ac · 102041ac
Commit 102041ac authored May 30, 2019 by Michel Engelen Committed by Filipa Lacerda May 30, 2019
Showing with 6 additions and 0 deletions

app/views/search/_form.html.haml app/views/search/_form.html.haml +1 -0

changelogs/unreleased/ee-11040-added-conditional-rendering.yml ...elogs/unreleased/ee-11040-added-conditional-rendering.yml +5 -0

No files found.
--- 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
+---
+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