diff options
| author | Scott Le <scott.lee318@gmail.com> | 2016-07-21 11:08:50 +0700 |
|---|---|---|
| committer | Scott Le <scott.lee318@gmail.com> | 2016-07-24 09:36:08 +0800 |
| commit | 70ab2f72c6d36c662bbb20d5d7ccdc7b713e99b2 (patch) | |
| tree | d9b3c8381db9dd048052906125d46bcea36217f5 | |
| parent | 03738bdd48d64e30c068df54eaf7e44d21e3c9fa (diff) | |
| download | gitlab-ce-70ab2f72c6d36c662bbb20d5d7ccdc7b713e99b2.tar.gz | |
remove search_id for label dropdown filter
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/issuable/_label_page_default.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/issues/filter_by_labels_spec.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 971a709e4c1..1144ff10c38 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.11.0 (unreleased) - Retrieve rendered HTML from cache in one request - Load project invited groups and members eagerly in ProjectTeam#fetch_members - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska) + - Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view' !5368 (Scott Le) v 8.10.1 (unreleased) - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml index 0acb8253139..4e280c371ac 100644 --- a/app/views/shared/issuable/_label_page_default.html.haml +++ b/app/views/shared/issuable/_label_page_default.html.haml @@ -4,7 +4,7 @@ - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels') .dropdown-page-one = dropdown_title(title) - = dropdown_filter(filter_placeholder, search_id: "label-name") + = dropdown_filter(filter_placeholder) = dropdown_content - if @project && show_footer = dropdown_footer do diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb index 5ea02b8d39c..cb117d2476f 100644 --- a/spec/features/issues/filter_by_labels_spec.rb +++ b/spec/features/issues/filter_by_labels_spec.rb @@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do page.within '.labels-filter' do click_button 'Label' wait_for_ajax - fill_in 'label-name', with: 'bug' + find('.dropdown-input input').set 'bug' page.within '.dropdown-content' do expect(page).not_to have_content 'enhancement' |