diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 09:07:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-14 09:07:31 +0300 |
| commit | cbe10896a535341739629eb4c682d69cebd0d009 (patch) | |
| tree | 3499345f8d7c6e8d0ac994df4d3be3ca314a10ad /app/controllers | |
| parent | 886077c08875d595fc88a689f1ac841252813513 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/onboarding/status.rb | 6 | ||||
| -rw-r--r-- | app/controllers/registrations/welcome_controller.rb | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/concerns/onboarding/status.rb b/app/controllers/concerns/onboarding/status.rb index 5112ebb3b5d..8a99f5a6c12 100644 --- a/app/controllers/concerns/onboarding/status.rb +++ b/app/controllers/concerns/onboarding/status.rb @@ -31,12 +31,6 @@ module Onboarding last_invited_member&.source end - def invite_with_tasks_to_be_done? - return false if members.empty? - - MemberTask.for_members(members).exists? - end - private attr_reader :user diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb index a10de3836ba..f7a601ec0bd 100644 --- a/app/controllers/registrations/welcome_controller.rb +++ b/app/controllers/registrations/welcome_controller.rb @@ -63,9 +63,7 @@ module Registrations end def update_success_path - if onboarding_status.invite_with_tasks_to_be_done? - issues_dashboard_path(assignee_username: current_user.username) - elsif onboarding_status.continue_full_onboarding? # trials/regular registration on .com + if 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) |