diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 00:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 00:09:59 +0300 |
| commit | d1fd19e525135c2805ae93d3a571ffcbc2414b0e (patch) | |
| tree | b0dd92c27864dfb3192a775d08626820613c3034 /app/models/members_preloader.rb | |
| parent | 8f4d63426a207611f71bc19dae62eb19765a4cf2 (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 a079aec76f2..e9b867308e1 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) + ActiveRecord::Associations::Preloader.new.preload(members, user: :webauthn_registrations) if Feature.enabled?(:webauthn) end end |