diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
| commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
| tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /app/helpers/dropdowns_helper.rb | |
| parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
| parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
| download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'app/helpers/dropdowns_helper.rb')
| -rw-r--r-- | app/helpers/dropdowns_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb index 14697f774cc..6b617e1730a 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -67,9 +67,9 @@ module DropdownsHelper end end - def dropdown_filter(placeholder) + def dropdown_filter(placeholder, search_id: nil) content_tag :div, class: "dropdown-input" do - filter_output = search_field_tag nil, nil, class: "dropdown-input-field", placeholder: placeholder + filter_output = search_field_tag search_id, nil, class: "dropdown-input-field", placeholder: placeholder filter_output << icon('search', class: "dropdown-input-search") filter_output << icon('times', class: "dropdown-input-clear js-dropdown-input-clear", role: "button") |