diff options
author | Robert Speicher <robert@gitlab.com> | 2018-11-06 19:36:20 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-11-06 19:36:20 +0300 |
commit | 60f4a9432fe8ae65dad894fe356bb62e6a0055f1 (patch) | |
tree | 7d86efc52d5a6b3969b7d7f81c1384af5f4e092e /app/controllers | |
parent | 992cff9c72f3942e7475dbbf4966fa438aaeb6af (diff) | |
parent | d76fdfcfdb1c815f687b01f2f7610f70bf3e378e (diff) |
Merge branch 'ce-jej/group-saml-sso-badges' into 'master'
CE MR for Group SAML SSO badges
See merge request gitlab-org/gitlab-ce!22587
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/members_presentation.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/concerns/members_presentation.rb b/app/controllers/concerns/members_presentation.rb index c6c3598a976..0a9d3d86245 100644 --- a/app/controllers/concerns/members_presentation.rb +++ b/app/controllers/concerns/members_presentation.rb @@ -12,12 +12,7 @@ module MembersPresentation ).fabricate! end - # rubocop: disable CodeReuse/ActiveRecord def preload_associations(members) - ActiveRecord::Associations::Preloader.new.preload(members, :user) - ActiveRecord::Associations::Preloader.new.preload(members, :source) - ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :status) - ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :u2f_registrations) + MembersPreloader.new(members).preload_all end - # rubocop: enable CodeReuse/ActiveRecord end |