Commit 8ec00fbd authored by Douwe Maan's avatar Douwe Maan

Merge branch 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'

parents e5c2fdf7 70ab2f72
...@@ -26,6 +26,10 @@ v 8.10.1 ...@@ -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 - 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 - Ignore invalid trusted proxies in X-Forwarded-For header. !5454
- Add links to the real markdown.md file for all GFM examples. !5458 - 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 v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter) - Fix profile activity heatmap to show correct day name (eanplatter)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels') - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
.dropdown-page-one .dropdown-page-one
= dropdown_title(title) = dropdown_title(title)
= dropdown_filter(filter_placeholder, search_id: "label-name") = dropdown_filter(filter_placeholder)
= dropdown_content = dropdown_content
- if @project && show_footer - if @project && show_footer
= dropdown_footer do = dropdown_footer do
......
...@@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do ...@@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do
page.within '.labels-filter' do page.within '.labels-filter' do
click_button 'Label' click_button 'Label'
wait_for_ajax wait_for_ajax
fill_in 'label-name', with: 'bug' find('.dropdown-input input').set 'bug'
page.within '.dropdown-content' do page.within '.dropdown-content' do
expect(page).not_to have_content 'enhancement' expect(page).not_to have_content 'enhancement'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment