Commit 4d7ead9b authored by Sean McGivern's avatar Sean McGivern

Merge branch '29316-can-t-select-a-mirror-user' into 'master'

Resolve "Can't select a mirror user"

See merge request !9854
parents 004b2528 5c0f6c85
...@@ -18,8 +18,7 @@ class AutocompleteController < ApplicationController ...@@ -18,8 +18,7 @@ class AutocompleteController < ApplicationController
if params[:search].blank? if params[:search].blank?
# Include current user if available to filter by "Me" # Include current user if available to filter by "Me"
if params[:current_user].present? && current_user if params[:current_user].present? && current_user
@users = @users.where.not(id: current_user.id) @users = [current_user, *@users].uniq
@users = [current_user, *@users]
end end
if params[:author_id].present? if params[:author_id].present?
......
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