diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-16 01:08:27 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-17 13:00:14 -0400 |
| commit | 00fe6307ab89443b3fbca8ee42df3b02c1b5cbd8 (patch) | |
| tree | e9927407dcaa83aad0a526cf8d6d7c5a2d86069c | |
| parent | c67d987ae96ca55b3ca04a55b4bca43c027d5dc6 (diff) | |
| download | gitlab-ce-10-0-stable-prepare-rc4.tar.gz | |
Merge branch 'rs-default-user-entity' into 'master'10-0-stable-prepare-rc4
Ensure we use `Entities::User` for non-admin `users/:id` API requests
See merge request gitlab-org/gitlab-ce!14314
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 1825c90a23b..bdebda58d3f 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -88,7 +88,7 @@ module API user = User.find_by(id: params[:id]) not_found!('User') unless user && can?(current_user, :read_user, user) - opts = current_user&.admin? ? { with: Entities::UserWithAdmin } : {} + opts = current_user&.admin? ? { with: Entities::UserWithAdmin } : { with: Entities::User } present user, opts end |