diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
| commit | 8c449310e245083e72513ec3addd0d2355333127 (patch) | |
| tree | a9ca028f0f19cab55e9d3d8afeffd58cc85bf192 /app/controllers/autocomplete_controller.rb | |
| parent | 52b4a74a73cbd0b13d46d0bcd9b063e36b520f05 (diff) | |
| parent | 5d8d72f18e9329978987fcb046467ceacd13c3ab (diff) | |
| download | gitlab-ce-refactor-cluster-show-page.tar.gz | |
Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-page
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index cde1e284d2d..86bade49ec9 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -8,12 +8,12 @@ class AutocompleteController < ApplicationController def users @users = AutocompleteUsersFinder.new(params: params, current_user: current_user, project: @project, group: @group).execute - render json: @users, only: [:name, :username, :id], methods: [:avatar_url] + render json: UserSerializer.new.represent(@users) end def user @user = User.find(params[:id]) - render json: @user, only: [:name, :username, :id], methods: [:avatar_url] + render json: UserSerializer.new.represent(@user) end def projects |