diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-16 01:08:27 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-16 01:08:27 +0000 |
| commit | c433b1917ec8c90d43972c6ec85d4af3fb030694 (patch) | |
| tree | cb0283b4b005c64c3eb8219dbbdc04686bca7b3f | |
| parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
| parent | 3cbaed97f1c085647bffcf8a729b72bc2a52d59e (diff) | |
| download | gitlab-ce-c433b1917ec8c90d43972c6ec85d4af3fb030694.tar.gz | |
Merge branch 'rs-default-user-entity' into 'master'
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 |