Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 3 deletions

diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index 664c26debb8..79557dae14a 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -65,7 +65,6 @@ 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)
@@ -74,6 +73,7 @@ module Groups
         end
       end
 
+      remove_paid_features_for_projects(old_root_ancestor_id)
       post_update_hooks(@updated_project_ids, old_root_ancestor_id)
       propagate_integrations
       update_pending_builds
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 30d9e1922cc..49648216808 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -131,8 +131,6 @@ module Projects
 
           update_integrations
 
-          remove_paid_features
-
           project.old_path_with_namespace = @old_path
 
           update_repository_configuration(@new_path)
@@ -143,6 +141,7 @@ module Projects
         end
       end
 
+      remove_paid_features
       update_pending_builds
 
       post_update_hooks(project, @old_group)