diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-07 15:05:17 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-07 15:05:17 +0200 |
| commit | ad55f0d6f9ec29026b36ee32ff5fc6081e3793de (patch) | |
| tree | cd2b9919de1d5597922ac0ac1c2c3dc9a54a0ab0 /app/controllers/autocomplete_controller.rb | |
| parent | 8b6ae0104df7e053ff3ad06e089c96273854c4e3 (diff) | |
| parent | 4b7c2f0b503eb7400cee4cd5011733d689393691 (diff) | |
| download | gitlab-ce-comment-updated-by.tar.gz | |
Merge branch 'master' into comment-updated-bycomment-updated-by
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 52e9c58b47c..5c3ca8e23c9 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -33,6 +33,8 @@ class AutocompleteController < ApplicationController @users = @users.search(params[:search]) if params[:search].present? @users = @users.active @users = @users.page(params[:page]).per(PER_PAGE) + # Always include current user if available to filter by "Me" + @users = User.find(@users.pluck(:id) + [current_user.id]).uniq if current_user render json: @users, only: [:name, :username, :id], methods: [:avatar_url] end |