diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-06 10:51:17 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-06 10:51:17 +0100 |
| commit | 797c2326c386437bbae711cf0ba9bc4eb6395492 (patch) | |
| tree | 2cb1f14952105a35928a9a972ec61970653a3422 /lib/api | |
| parent | dec42e42013def7c948feafce2c866fa5c3413df (diff) | |
| parent | 8393e3e04b8b336ec80cb0da49d273f709043120 (diff) | |
| download | gitlab-ce-797c2326c386437bbae711cf0ba9bc4eb6395492.tar.gz | |
Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce
Diffstat (limited to 'lib/api')
| -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 3400f0713ef..0d7813428e2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -39,7 +39,7 @@ module API if current_user.is_admin? present @user, with: Entities::UserFull else - present @user, with: Entities::UserBasic + present @user, with: Entities::User end end |