diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/controllers/registrations_controller.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/controllers/registrations_controller.rb')
-rw-r--r-- | app/controllers/registrations_controller.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index b1c1fe3ba74..2a865aac767 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -17,7 +17,8 @@ class RegistrationsController < Devise::RegistrationsController def new if experiment_enabled?(:signup_flow) - track_experiment_event(:signup_flow, 'start') # We want this event to be tracked when the user is _in_ the experimental group + track_experiment_event(:terms_opt_in, 'start') + @resource = build_resource else redirect_to new_user_session_path(anchor: 'register-pane') @@ -25,8 +26,7 @@ class RegistrationsController < Devise::RegistrationsController end def create - track_experiment_event(:signup_flow, 'end') unless experiment_enabled?(:signup_flow) # We want this event to be tracked when the user is _in_ the control group - + track_experiment_event(:terms_opt_in, 'end') accept_pending_invitations super do |new_user| @@ -62,9 +62,11 @@ class RegistrationsController < Devise::RegistrationsController result = ::Users::SignupService.new(current_user, user_params).execute if result[:status] == :success - track_experiment_event(:signup_flow, 'end') # We want this event to be tracked when the user is _in_ the experimental group + if ::Gitlab.com? && show_onboarding_issues_experiment? + track_experiment_event(:onboarding_issues, 'signed_up') + record_experiment_user(:onboarding_issues) + end - track_experiment_event(:onboarding_issues, 'signed_up') if ::Gitlab.com? && show_onboarding_issues_experiment? return redirect_to new_users_sign_up_group_path if experiment_enabled?(:onboarding_issues) && show_onboarding_issues_experiment? set_flash_message! :notice, :signed_up @@ -178,6 +180,8 @@ class RegistrationsController < Devise::RegistrationsController end def terms_accepted? + return true if experiment_enabled?(:terms_opt_in) + Gitlab::Utils.to_boolean(params[:terms_opt_in]) end |