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/users.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/users.rb')
| -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 bfb69d6dc18..7257ecb5b67 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -59,7 +59,7 @@ module API users = UsersFinder.new(current_user, params).execute - entity = current_user.admin? ? Entities::UserWithAdmin : Entities::UserBasic + entity = current_user.admin? ? Entities::UserPublic : Entities::UserBasic present paginate(users), with: entity end |