From 102041ac0add7bdcf87e207705c82c9ffde0a249 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Thu, 30 May 2019 09:35:10 +0000 Subject: [PATCH] Backport of EE change in `app/views/search/_form.html.haml` --- app/views/search/_form.html.haml | 1 + .../unreleased/ee-11040-added-conditional-rendering.yml | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 changelogs/unreleased/ee-11040-added-conditional-rendering.yml diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml index 4af0c6bf84a..db0dcc8adfb 100644 --- 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' diff --git a/changelogs/unreleased/ee-11040-added-conditional-rendering.yml b/changelogs/unreleased/ee-11040-added-conditional-rendering.yml new file mode 100644 index 00000000000..7b06e43830f --- /dev/null +++ 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