diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /app/controllers/registrations | |
parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'app/controllers/registrations')
-rw-r--r-- | app/controllers/registrations/welcome_controller.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb index 76f181e3ce8..68f8248d114 100644 --- a/app/controllers/registrations/welcome_controller.rb +++ b/app/controllers/registrations/welcome_controller.rb @@ -4,6 +4,7 @@ module Registrations class WelcomeController < ApplicationController include OneTrustCSP include GoogleAnalyticsCSP + include GoogleSyndicationCSP include ::Gitlab::Utils::StrongMemoize layout 'minimal' @@ -53,11 +54,6 @@ module Registrations stored_location_for(user) || last_member_activity_path end - # overridden in EE - def complete_signup_onboarding? - onboarding_status.continue_full_onboarding? - end - def last_member_activity_path return dashboard_projects_path unless onboarding_status.last_invited_member_source.present? @@ -67,7 +63,7 @@ module Registrations def update_success_path if onboarding_status.invite_with_tasks_to_be_done? issues_dashboard_path(assignee_username: current_user.username) - elsif complete_signup_onboarding? # trials/regular registration on .com + elsif onboarding_status.continue_full_onboarding? # trials/regular registration on .com signup_onboarding_path elsif onboarding_status.single_invite? # invites w/o tasks due to order flash[:notice] = helpers.invite_accepted_notice(onboarding_status.last_invited_member) @@ -94,7 +90,7 @@ module Registrations end def onboarding_status - Onboarding::Status.new(current_user) + Onboarding::Status.new(params.to_unsafe_h.deep_symbolize_keys, session, current_user) end strong_memoize_attr :onboarding_status end |