diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:01 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:01 +0100 |
| commit | c0849101e6d79bed12c830986c7ff63b2e2f3d9e (patch) | |
| tree | 23338ba74654a5cd8b75adc21921f5cd6621b459 /lib/api | |
| parent | 097faeb481db2a4956b41049c041d55f5da4e2c1 (diff) | |
| parent | 95b1adb3394851132ea7ecb3104e9a857bdad82f (diff) | |
| download | gitlab-ce-c0849101e6d79bed12c830986c7ff63b2e2f3d9e.tar.gz | |
Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked
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 |