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

3 files changed, 19 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
diff --git a/app/models/members_preloader.rb b/app/models/members_preloader.rb
new file mode 100644
index 00000000000..33855191ca8
--- /dev/null
+++ b/app/models/members_preloader.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class MembersPreloader
+  attr_reader :members
+
+  def initialize(members)
+    @members = members
+  end
+
+  def preload_all
+    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)
+  end
+end
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 2682d92fc56..b4b3f4a6b7e 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -14,6 +14,8 @@
         = user_status(user)
         %span.cgray= user.to_reference
 
+        = render_if_exists 'shared/members/ee/sso_badge', member: member
+
         - if user == current_user
           %span.badge.badge-success.prepend-left-5 It's you