Merge branch 'current-user-filter-top' into 'master'

Shows current user on top of filtered dropdown list

Closes #26765

See merge request !8612

3 files changed, 13 insertions, 1 deletions

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 5f13353baa1..6db4e1dc1bc 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -18,7 +18,7 @@ class AutocompleteController < ApplicationController
     if params[:search].blank?
       # Include current user if available to filter by "Me"
       if params[:current_user].present? && current_user
-        @users = [*@users, current_user]
+        @users = [current_user, *@users]
       end
 
       if params[:author_id].present?
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index 6f6a2532c04..3ac9b2e0ae0 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -66,6 +66,12 @@ describe 'Dropdown assignee', js: true, feature: true do
 
       expect(dropdown_assignee_size).to eq(3)
     end
+
+    it 'shows current user at top of dropdown' do
+      send_keys_to_filtered_search('assignee:')
+
+      expect(first('#js-dropdown-assignee .filter-dropdown li')).to have_content(user.name)
+    end
   end
 
   describe 'filtering' do
diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb
index 60a86cc93d4..464749d01e3 100644
--- a/spec/features/issues/filtered_search/dropdown_author_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb
@@ -66,6 +66,12 @@ describe 'Dropdown author', js: true, feature: true do
 
       expect(dropdown_author_size).to eq(3)
     end
+
+    it 'shows current user at top of dropdown' do
+      send_keys_to_filtered_search('author:')
+
+      expect(first('#js-dropdown-author li')).to have_content(user.name)
+    end
   end
 
   describe 'filtering' do