From e0cc7bd72f3cf99f63950f2d5db27e3221eaeb49 Mon Sep 17 00:00:00 2001 From: Chris Peressini Date: Wed, 22 Mar 2017 11:31:48 +0000 Subject: [PATCH 1/4] Update copy for first row in filtered search dropdown --- spec/features/issues/filtered_search/dropdown_hint_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb index 01b657bcada..bc8cbe30e66 100644 --- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb @@ -43,10 +43,10 @@ describe 'Dropdown hint', js: true, feature: true do end describe 'filtering' do - it 'does not filter `Keep typing and press Enter`' do + it 'does not filter `Press Enter or click to search`' do filtered_search.set('randomtext') - expect(page).to have_css(js_dropdown_hint, text: 'Keep typing and press Enter', visible: false) + expect(page).to have_css(js_dropdown_hint, text: 'Press Enter or click to search', visible: false) expect(dropdown_hint_size).to eq(0) end From 67f9614c43070b721993956af1f25fbe4719a345 Mon Sep 17 00:00:00 2001 From: Chris Peressini Date: Wed, 22 Mar 2017 11:41:07 +0000 Subject: [PATCH 2/4] Change copy for first row in filtered search --- app/views/shared/issuable/_search_bar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index b58640c3ef0..330fa8a5b10 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -25,7 +25,7 @@ %button.btn.btn-link = icon('search') %span - Keep typing and press Enter + Press Enter or click to search %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } } %li.filter-dropdown-item %button.btn.btn-link From 640091752d0e788b53614295bb0cc403c4e3645f Mon Sep 17 00:00:00 2001 From: Chris Peressini Date: Wed, 29 Mar 2017 11:20:06 +0100 Subject: [PATCH 3/4] Add changelog --- .../unreleased/29828-change-search-hint-in-new-filters.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/29828-change-search-hint-in-new-filters.yml diff --git a/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml b/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml new file mode 100644 index 00000000000..7a2404d123a --- /dev/null +++ b/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml @@ -0,0 +1,4 @@ +--- +title: Change hint on first row of filters dropdown to `Press Enter or click to search` +merge_request: 10138 +author: Chris Peressini From a1cd443be5f0783bba74fedec316853e5922c673 Mon Sep 17 00:00:00 2001 From: Chris Peressini Date: Wed, 29 Mar 2017 15:23:04 +0000 Subject: [PATCH 4/4] Remove author from changelog --- .../unreleased/29828-change-search-hint-in-new-filters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml b/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml index 7a2404d123a..a9322693ca4 100644 --- a/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml +++ b/changelogs/unreleased/29828-change-search-hint-in-new-filters.yml @@ -1,4 +1,4 @@ --- title: Change hint on first row of filters dropdown to `Press Enter or click to search` merge_request: 10138 -author: Chris Peressini +author: