From bb069b39a25f09fcb898500ce7b29ae936392ce8 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 27 Jan 2017 16:58:22 +0000 Subject: Merge branch 'speed-up-members-dropdown' into 'master' Don't call `#uniq` on a relation See merge request !8784 --- app/controllers/autocomplete_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 6db4e1dc1bc..d7a45bacd35 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -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] -- cgit v1.2.1