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

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