Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index 6b979308d26..664c26debb8 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -65,6 +65,7 @@ module Groups
       ) do
         Group.transaction do
           update_group_attributes
+          remove_paid_features_for_projects(old_root_ancestor_id)
           ensure_ownership
           update_integrations
           remove_issue_contacts(old_root_ancestor_id, was_root_group)
@@ -179,6 +180,10 @@ module Groups
       @group.reload # rubocop:disable Cop/ActiveRecordAssociationReload
     end
 
+    # Overridden in EE
+    def remove_paid_features_for_projects(old_root_ancestor_id)
+    end
+
     # rubocop: disable CodeReuse/ActiveRecord
     def update_children_and_projects_visibility
       descendants = @group.descendants.where("visibility_level > ?", @new_parent_group.visibility_level)