diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-25 18:13:28 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-25 18:13:28 -0600 |
| commit | 8ec00fbdd21d512b9fa4f764f8c92728e4885739 (patch) | |
| tree | 48b176527fcaf9364c151a28a3fcbb4fbcfa60e2 | |
| parent | e5c2fdf718df9164fa6d1c649a8bff4233a24a44 (diff) | |
| parent | 70ab2f72c6d36c662bbb20d5d7ccdc7b713e99b2 (diff) | |
| download | gitlab-ce-8ec00fbdd21d512b9fa4f764f8c92728e4885739.tar.gz | |
Merge branch 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -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, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index d25f61a3096..534f57cb08e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,10 @@ v 8.10.1 - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page. !5446 - Ignore invalid trusted proxies in X-Forwarded-For header. !5454 - Add links to the real markdown.md file for all GFM examples. !5458 + - 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 v 8.10.0 - Fix profile activity heatmap to show correct day name (eanplatter) 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' |