diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
| commit | 5213bf2bf713f1647c05821d42afea90d93a57b6 (patch) | |
| tree | 4224004367013ba02b5bba24bdfcda3bb03ae4e8 /lib/api/entities.rb | |
| parent | 1578ee93475c0ebb62399403d971e99aa45e7276 (diff) | |
| download | gitlab-ce-revert-1578ee93.tar.gz | |
Revert "Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce"revert-1578ee93
This reverts commit 1578ee93475c0ebb62399403d971e99aa45e7276
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8bce79529e6..412443a2405 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -43,12 +43,9 @@ module API expose :external end - class UserWithAdmin < UserPublic - expose :admin?, as: :is_admin - end - - class UserWithPrivateDetails < UserWithAdmin + class UserWithPrivateDetails < UserPublic expose :private_token + expose :admin?, as: :is_admin end class Email < Grape::Entity |