diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-04 09:49:53 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-12-04 09:49:53 +0000 |
| commit | 7c2b7296d4e623ba4eaa19cf03405ee7f2ae1ca9 (patch) | |
| tree | 80784f83c52313797b8cf7e78ccf8db66f0880d8 /lib/api/users.rb | |
| parent | c997c95dfca2c3d30f8c7b8ef5f0fd95c1356226 (diff) | |
| download | gitlab-ce-7c2b7296d4e623ba4eaa19cf03405ee7f2ae1ca9.tar.gz | |
Added default order to UserFinder
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 0cd89b1bcf8..e5de31ad51b 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -76,6 +76,8 @@ module API forbidden!("Not authorized to access /api/v4/users") unless authorized entity = current_user&.admin? ? Entities::UserWithAdmin : Entities::UserBasic + users = users.preload(:identities, :u2f_registrations) if entity == Entities::UserWithAdmin + present paginate(users), with: entity end |