Automatic merge of gitlab-org/gitlab-ce master

app/views/shared/issuable/_sort_dropdown.html.haml

@@ -5,7 +5,7 @@
 .dropdown.inline.prepend-left-10.issue-sort-dropdown
   .btn-group{ role: 'group' }
     .btn-group{ role: 'group' }
-      %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
+      %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
         = sort_title
         = icon('chevron-down')
       %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort

changelogs/unreleased/57582-dropdown-icon-misalignment-on-issues-list-on-mobile-screen.yml

+---
+title: Fix alignment of dropdown icon on issuable on mobile
+merge_request: 25205
+author: Takuya Noguchi
+type: fixed

spec/features/issues/filtered_search/visual_tokens_spec.rb

@@ -59,13 +59,6 @@ describe 'Visual tokens', :js do
       expect(page).to have_css('#js-dropdown-author', visible: false)
     end
 
-    it 'ends editing mode when scroll container is clicked' do
-      find('.scroll-container').click
-
-      expect_filtered_search_input_empty
-      expect(page).to have_css('#js-dropdown-author', visible: false)
-    end
-
     describe 'selecting different author from dropdown' do
       before do
         filter_author_dropdown.find('.filter-dropdown-item .dropdown-light-content', text: "@#{user_rock.username}").click
@@ -109,13 +102,6 @@ describe 'Visual tokens', :js do
       expect(page).to have_css('#js-dropdown-assignee', visible: false)
     end
 
-    it 'ends editing mode when scroll container is clicked' do
-      find('.scroll-container').click
-
-      expect_filtered_search_input_empty
-      expect(page).to have_css('#js-dropdown-assignee', visible: false)
-    end
-
     describe 'selecting static option from dropdown' do
       before do
         find("#js-dropdown-assignee").find('.filter-dropdown-item', text: 'None').click
@@ -167,13 +153,6 @@ describe 'Visual tokens', :js do
       expect_filtered_search_input_empty
       expect(page).to have_css('#js-dropdown-milestone', visible: false)
     end
-
-    it 'ends editing mode when scroll container is clicked' do
-      find('.scroll-container').click
-
-      expect_filtered_search_input_empty
-      expect(page).to have_css('#js-dropdown-milestone', visible: false)
-    end
   end
 
   describe 'editing label token' do