kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'issue/11040' into 'master'

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

See merge request gitlab-org/gitlab-ce!28883
This commit is contained in:
Filipa Lacerda 2019-05-30 09:35:11 +00:00
commit c8b4edf651
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/search/_form.html.haml
View file

@ -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'

5
changelogs/unreleased/ee-11040-added-conditional-rendering.yml Normal file
View file

@ -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