Merge branch 'speed-up-members-dropdown' into 'master'

Don't call `#uniq` on a relation

See merge request !8784
This commit is contained in:
Douwe Maan 2017-01-27 16:58:22 +00:00
commit 916fae3a77
1 changed files with 2 additions and 3 deletions

View File

@ -18,15 +18,14 @@ 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]
end
if params[:author_id].present?
author = User.find_by_id(params[:author_id])
@users = [author, *@users] if author
@users = [author, *@users].uniq if author
end
@users.uniq!
end
render json: @users, only: [:name, :username, :id], methods: [:avatar_url]