diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-07 12:08:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-07 12:08:27 +0000 |
| commit | a8653790086d284cecffdc35892bb422cd6c9a7b (patch) | |
| tree | 8d1f4dc69026a42a47b1026eef2566c7461a52fe /lib/api/users.rb | |
| parent | 444f662b8d8cbe47a8f3fa1db6ed926d64f3def3 (diff) | |
| download | gitlab-ce-a8653790086d284cecffdc35892bb422cd6c9a7b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index b630ca057db..73bb43b88fc 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -116,6 +116,7 @@ module API entity = current_user&.admin? ? Entities::UserWithAdmin : Entities::UserBasic users = users.preload(:identities, :u2f_registrations) if entity == Entities::UserWithAdmin + users = users.preload(:identities, :webauthn_registrations) if entity == Entities::UserWithAdmin users, options = with_custom_attributes(users, { with: entity, current_user: current_user }) users = users.preload(:user_detail) |