diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-30 09:35:11 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-30 09:35:11 +0000 |
| commit | c8b4edf651009c4603802bf22a66a04d395b4f00 (patch) | |
| tree | 1f746ddb77a46334e4b6e65b86dce054c9f7c97c | |
| parent | 3a50fc5d193c4d3c2687875222fee33acdab528f (diff) | |
| parent | 102041ac0add7bdcf87e207705c82c9ffde0a249 (diff) | |
| download | gitlab-ce-c8b4edf651009c4603802bf22a66a04d395b4f00.tar.gz | |
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
| -rw-r--r-- | app/views/search/_form.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/ee-11040-added-conditional-rendering.yml | 5 |
2 files changed, 6 insertions, 0 deletions
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 |