Commit c8b4edf6 authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents 3a50fc5d 102041ac
...@@ -13,3 +13,4 @@ ...@@ -13,3 +13,4 @@
- unless params[:snippets].eql? 'true' - unless params[:snippets].eql? 'true'
= render 'filter' = render 'filter'
= button_tag _("Search"), class: "btn btn-success btn-search" = button_tag _("Search"), class: "btn btn-success btn-search"
= render_if_exists 'search/form_elasticsearch'
---
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment