From a8653790086d284cecffdc35892bb422cd6c9a7b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 7 Sep 2020 12:08:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/api/users.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/api/users.rb') 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) -- cgit v1.2.1