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
This commit is contained in:
commit
60f4a9432f
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue