Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 3 insertions, 12 deletions

diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index d508865ef32..68bb6427350 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -57,7 +57,7 @@ module Groups
     end
 
     def after_create_hook
-      track_experiment_event
+      # overridden in EE
     end
 
     def remove_unallowed_params
@@ -109,15 +109,6 @@ module Groups
       @group.shared_runners_enabled = @group.parent.shared_runners_enabled
       @group.allow_descendants_override_disabled_shared_runners = @group.parent.allow_descendants_override_disabled_shared_runners
     end
-
-    def track_experiment_event
-      return unless group.persisted?
-
-      # Track namespace created events to relate them with signed up events for
-      # the same experiment.  This will let us associate created namespaces to
-      # users that signed up from the experimental logged out header.
-      experiment(:logged_out_marketing_header, actor: current_user).track(:namespace_created, namespace: group)
-    end
   end
 end
 
diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb
index 2135892a95a..925a2acbb58 100644
--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -10,6 +10,8 @@ module Groups
       reject_parent_id!
       remove_unallowed_params
 
+      before_assignment_hook(group, params)
+
       if renaming_group_with_container_registry_images?
         group.errors.add(:base, container_images_error)
         return false
@@ -25,8 +27,6 @@ module Groups
 
       handle_changes
 
-      before_assignment_hook(group, params)
-
       handle_namespace_settings
 
       group.assign_attributes(params)