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
This commit is contained in:
commit
c433b1917e
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue