diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-10-12 10:26:13 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-11-02 11:39:01 +0100 |
| commit | fbdf057898475653c847601f257e140494944f46 (patch) | |
| tree | 66da6450d9c3cb0438561e53d0fc8ced2a514279 /lib/api | |
| parent | a72d687931fa5be3b8828fa202e61d42c607dae1 (diff) | |
| download | gitlab-ce-fbdf057898475653c847601f257e140494944f46.tar.gz | |
Remove private_token from API user entity
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 4 | ||||
| -rw-r--r-- | lib/api/users.rb | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index efe874b2e6b..67cecb6a7ad 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -57,10 +57,6 @@ module API expose :admin?, as: :is_admin end - class UserWithPrivateDetails < UserWithAdmin - expose :private_token - end - class Email < Grape::Entity expose :id, :email end diff --git a/lib/api/users.rb b/lib/api/users.rb index b6f97a1eac2..d80b364bd09 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -507,9 +507,7 @@ module API end get do entity = - if sudo? - Entities::UserWithPrivateDetails - elsif current_user.admin? + if current_user.admin? Entities::UserWithAdmin else Entities::UserPublic |