diff options
Diffstat (limited to 'app/controllers/registrations')
-rw-r--r-- | app/controllers/registrations/experience_levels_controller.rb | 10 | ||||
-rw-r--r-- | app/controllers/registrations/welcome_controller.rb | 19 |
2 files changed, 5 insertions, 24 deletions
diff --git a/app/controllers/registrations/experience_levels_controller.rb b/app/controllers/registrations/experience_levels_controller.rb index 23126983eb5..b6ed0366177 100644 --- a/app/controllers/registrations/experience_levels_controller.rb +++ b/app/controllers/registrations/experience_levels_controller.rb @@ -2,9 +2,8 @@ module Registrations class ExperienceLevelsController < ApplicationController - layout 'devise_experimental_onboarding_issues' + layout 'signup_onboarding' - before_action :check_experiment_enabled before_action :ensure_namespace_path_param feature_category :navigation @@ -14,9 +13,8 @@ module Registrations if current_user.save hide_advanced_issues - record_experiment_user(:default_to_issues_board) - if experiment_enabled?(:default_to_issues_board) && learn_gitlab.available? + if learn_gitlab.available? redirect_to namespace_project_board_path(params[:namespace_path], learn_gitlab.project, learn_gitlab.board) else redirect_to group_path(params[:namespace_path]) @@ -28,10 +26,6 @@ module Registrations private - def check_experiment_enabled - access_denied! unless experiment_enabled?(:onboarding_issues) - end - def ensure_namespace_path_param redirect_to root_path unless params[:namespace_path].present? end diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb index 4a6fef56ef5..a1a6a057171 100644 --- a/app/controllers/registrations/welcome_controller.rb +++ b/app/controllers/registrations/welcome_controller.rb @@ -16,9 +16,7 @@ module Registrations result = ::Users::SignupService.new(current_user, update_params).execute if result[:status] == :success - process_gitlab_com_tracking - - return redirect_to new_users_sign_up_group_path if experiment_enabled?(:onboarding_issues) && show_onboarding_issues_experiment? + return redirect_to new_users_sign_up_group_path if show_signup_onboarding? redirect_to path_for_signed_in_user(current_user) else @@ -36,14 +34,6 @@ module Registrations current_user.role.present? && !current_user.setup_for_company.nil? end - def process_gitlab_com_tracking - return false unless ::Gitlab.com? - return false unless show_onboarding_issues_experiment? - - track_experiment_event(:onboarding_issues, 'signed_up') - record_experiment_user(:onboarding_issues) - end - def update_params params.require(:user).permit(:role, :other_role, :setup_for_company) end @@ -61,11 +51,8 @@ module Registrations stored_location_for(user) || dashboard_projects_path end - def show_onboarding_issues_experiment? - !helpers.in_subscription_flow? && - !helpers.in_invitation_flow? && - !helpers.in_oauth_flow? && - !helpers.in_trial_flow? + def show_signup_onboarding? + false end end end |