summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-10 14:30:46 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-10 14:30:46 +0000
commit4d7ead9b210f866c8f223e3d7ef89347d9d305bb (patch)
tree46b8225f10c30c741271a98e3929267c65d88771
parent004b252890e30df47c51fe81b4293b5c46f3c58e (diff)
parent5c0f6c856de37b022f5a429b50a1784cf374c45f (diff)
downloadgitlab-ce-4d7ead9b210f866c8f223e3d7ef89347d9d305bb.tar.gz
Merge branch '29316-can-t-select-a-mirror-user' into 'master'
Resolve "Can't select a mirror user" See merge request !9854
-rw-r--r--app/controllers/autocomplete_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index d7a45bacd35..b79ca034c5b 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -18,8 +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.where.not(id: current_user.id)
- @users = [current_user, *@users]
+ @users = [current_user, *@users].uniq
end
if params[:author_id].present?