Commit 916fae3a authored by Douwe Maan's avatar Douwe Maan

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

Don't call `#uniq` on a relation

See merge request !8784
parents b9d841c0 2c40a012
...@@ -18,15 +18,14 @@ class AutocompleteController < ApplicationController ...@@ -18,15 +18,14 @@ 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] @users = [current_user, *@users]
end end
if params[:author_id].present? if params[:author_id].present?
author = User.find_by_id(params[:author_id]) author = User.find_by_id(params[:author_id])
@users = [author, *@users] if author @users = [author, *@users].uniq if author
end end
@users.uniq!
end end
render json: @users, only: [:name, :username, :id], methods: [:avatar_url] render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
......
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