diff options
Diffstat (limited to 'app/models/members/group_member.rb')
-rw-r--r-- | app/models/members/group_member.rb | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index e3ead1b04d0..b04fb1f6768 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -18,25 +18,12 @@ class GroupMember < Member default_scope { where(source_type: SOURCE_TYPE) } # rubocop:disable Cop/DefaultScope - scope :of_groups, ->(groups) { where(source_id: groups&.select(:id)) } + scope :of_groups, ->(groups) { where(source_id: groups) } scope :of_ldap_type, -> { where(ldap: true) } scope :count_users_by_group_id, -> { group(:source_id).count } - after_create :update_two_factor_requirement, unless: :invite? - after_destroy :update_two_factor_requirement, unless: :invite? - attr_accessor :last_owner - def update_two_factor_requirement - return unless user - - Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction( - %w[users user_details user_preferences], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424288' - ) do - user.update_two_factor_requirement - end - end - # For those who get to see a modal with a role dropdown, here are the options presented def self.permissible_access_level_roles(_, _) # This method is a stopgap in preparation for https://gitlab.com/gitlab-org/gitlab/-/issues/364087 @@ -56,10 +43,6 @@ class GroupMember < Member Group.sti_name end - def notifiable_options - { group: group } - end - def last_owner_of_the_group? return false unless access_level == Gitlab::Access::OWNER return last_owner unless last_owner.nil? @@ -87,40 +70,6 @@ class GroupMember < Member super end - - def send_invite - run_after_commit_or_now { notification_service.invite_group_member(self, @raw_invite_token) } - - super - end - - def post_create_hook - run_after_commit_or_now { notification_service.new_group_member(self) } - - super - end - - def post_update_hook - if saved_change_to_access_level? - run_after_commit { notification_service.update_group_member(self) } - end - - if saved_change_to_expires_at? - run_after_commit { notification_service.updated_group_member_expiration(self) } - end - - super - end - - def after_accept_invite - run_after_commit_or_now do - notification_service.accept_group_invite(self) - end - - update_two_factor_requirement - - super - end end GroupMember.prepend_mod_with('GroupMember') |