Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index 6fbf7daeb81..0a9705181ba 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -34,6 +34,7 @@ module Groups
         update_integrations
         remove_issue_contacts(old_root_ancestor_id, was_root_group)
         update_crm_objects(was_root_group)
+        remove_namespace_commit_emails(was_root_group)
       end
 
       post_update_hooks(@updated_project_ids, old_root_ancestor_id)
@@ -279,6 +280,10 @@ module Groups
 
       Gitlab::EventStore.publish(event)
     end
+
+    def remove_namespace_commit_emails(was_root_group)
+      Users::NamespaceCommitEmail.delete_for_namespace(@group) if was_root_group
+    end
   end
 end