summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-19 09:56:02 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-01-19 09:56:02 +0000
commit56512cc19c56d0ddef8b19bdc72d7affff4975c2 (patch)
tree7a75ff38e73c5abdf18ec14b3baed0ffb3d21170 /app
parent270dc22658424ee7f279db99e56c6fc69acd3eb7 (diff)
parent92682b8ae1ee0620916bdebfe3194967ce1eb2e7 (diff)
downloadgitlab-ce-56512cc19c56d0ddef8b19bdc72d7affff4975c2.tar.gz
Merge branch 'current-user-filter-top' into 'master'
Shows current user on top of filtered dropdown list Closes #26765 See merge request !8612
Diffstat (limited to 'app')
-rw-r--r--app/controllers/autocomplete_controller.rb2
1 files changed, 1 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?