Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb
index 303ee431a4d..ced21b8f291 100644
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@@ -16,7 +16,7 @@ module Registrations
       result = ::Users::SignupService.new(current_user, update_params).execute
 
       if result[:status] == :success
-        return redirect_to new_users_sign_up_group_path if show_signup_onboarding?
+        return redirect_to new_users_sign_up_group_path(trial_params) if show_signup_onboarding?
 
         members = current_user.members
 
@@ -41,7 +41,7 @@ module Registrations
     end
 
     def update_params
-      params.require(:user).permit(:role, :other_role, :setup_for_company, :email_opted_in)
+      params.require(:user).permit(:role, :other_role, :setup_for_company)
     end
 
     def requires_confirmation?(user)
@@ -67,6 +67,10 @@ module Registrations
     def show_signup_onboarding?
       false
     end
+
+    def trial_params
+      nil
+    end
   end
 end