Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 20 deletions

diff --git a/app/controllers/concerns/registrations_tracking.rb b/app/controllers/concerns/registrations_tracking.rb
deleted file mode 100644
index 6c83c57d9dd..00000000000
--- a/app/controllers/concerns/registrations_tracking.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module RegistrationsTracking
-  extend ActiveSupport::Concern
-
-  included do
-    helper_method :glm_tracking_params
-  end
-
-  private
-
-  def glm_tracking_params
-    params.permit(:glm_source, :glm_content)
-  end
-end
-
-RegistrationsTracking.prepend_mod
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb
index 87fcb499d21..158536b6ba1 100644
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@@ -4,12 +4,13 @@ module Registrations
   class WelcomeController < ApplicationController
     include OneTrustCSP
     include GoogleAnalyticsCSP
-    include RegistrationsTracking
 
     layout 'minimal'
     skip_before_action :authenticate_user!, :required_signup_info, :check_two_factor_requirement, only: [:show, :update]
     before_action :require_current_user
 
+    helper_method :welcome_update_params
+
     feature_category :user_management
 
     def show
@@ -98,6 +99,11 @@ module Registrations
 
     # overridden in EE
     def track_event(action); end
+
+    # overridden in EE
+    def welcome_update_params
+      {}
+    end
   end
 end
 
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 5c67e056d66..9a1f1532d7f 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -9,7 +9,6 @@ class RegistrationsController < Devise::RegistrationsController
   include BizibleCSP
   include GoogleAnalyticsCSP
   include PreferredLanguageSwitcher
-  include RegistrationsTracking
   include Gitlab::Tracking::Helpers::WeakPasswordErrorEvent
 
   layout 'devise'
@@ -30,6 +29,7 @@ class RegistrationsController < Devise::RegistrationsController
   feature_category :user_management
 
   helper_method :arkose_labs_enabled?
+  helper_method :registration_path_params
 
   def new
     @resource = build_resource
@@ -150,7 +150,12 @@ class RegistrationsController < Devise::RegistrationsController
   private
 
   def after_sign_up_path
-    users_sign_up_welcome_path(glm_tracking_params)
+    users_sign_up_welcome_path
+  end
+
+  # overridden in EE
+  def registration_path_params
+    {}
   end
 
   def track_creation(user:)