diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 18:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 18:09:03 +0300 |
| commit | 67fa8362ae35ab6134454aa74ad536eb405dff29 (patch) | |
| tree | 8adb151eabf5467dd3c3ee7dfbd0a7df70c5fd51 /app/models/members_preloader.rb | |
| parent | 669ad9e431c7647f01bda681aab2c0ad2cb58826 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/members_preloader.rb')
| -rw-r--r-- | app/models/members_preloader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/members_preloader.rb b/app/models/members_preloader.rb index 8b8eca54550..ba7e4b39989 100644 --- a/app/models/members_preloader.rb +++ b/app/models/members_preloader.rb @@ -13,7 +13,7 @@ class MembersPreloader ActiveRecord::Associations::Preloader.new.preload(members, :created_by) ActiveRecord::Associations::Preloader.new.preload(members, user: :status) ActiveRecord::Associations::Preloader.new.preload(members, user: :u2f_registrations) - ActiveRecord::Associations::Preloader.new.preload(members, user: :webauthn_registrations) if Feature.enabled?(:webauthn, default_enabled: :yaml) + ActiveRecord::Associations::Preloader.new.preload(members, user: :webauthn_registrations) if Feature.enabled?(:webauthn) end end |