diff --git a/ee/app/controllers/registrations/welcome_controller.rb b/ee/app/controllers/registrations/welcome_controller.rb
index fa71a93b93d8b02d3786085e4e91261d4d13e418..02c919a61c7ff604efef167648ef10000d76eab8 100644
--- a/ee/app/controllers/registrations/welcome_controller.rb
+++ b/ee/app/controllers/registrations/welcome_controller.rb
@@ -21,12 +21,6 @@ class WelcomeController < ApplicationController
def show
return redirect_to path_for_signed_in_user if completed_welcome_step?
- # We to perform cookie migration for variant assignment from logged out to log in
- # calling this in the controller layer gives us access to request where the
- # signed cookie exist with the info we need for migration.
- experiment(:free_trial_registration_redesign, actor: current_user).run
- experiment(:free_trial_registration_redesign, actor: current_user).track(:show, label: 'welcome')
-
track_event('render')
end
diff --git a/ee/app/controllers/users/identity_verification_controller.rb b/ee/app/controllers/users/identity_verification_controller.rb
index 6ebe7f1e4aebfc635d6ea01910eb6005a25bf981..c19dcedfc45f5789678f7755616f1e8fd4d647c6 100644
--- a/ee/app/controllers/users/identity_verification_controller.rb
+++ b/ee/app/controllers/users/identity_verification_controller.rb
@@ -32,12 +32,6 @@ class IdentityVerificationController < ApplicationController
def show
push_frontend_feature_flag(:auto_request_phone_number_verification_exemption, @user, type: :gitlab_com_derisk)
-
- # We to perform cookie migration for tracking from logged out to log in
- # calling this before tracking gives us access to request where the
- # signed cookie exist with the info we need for migration.
- experiment(:free_trial_registration_redesign, actor: @user).run
- experiment(:free_trial_registration_redesign, actor: @user).track(:show, label: 'identity_verification')
end
def verification_state
diff --git a/ee/app/experiments/free_trial_registration_redesign_experiment.rb b/ee/app/experiments/free_trial_registration_redesign_experiment.rb
deleted file mode 100644
index f82e6cd66288336351b0abf8649a63ec6dd5bba1..0000000000000000000000000000000000000000
--- a/ee/app/experiments/free_trial_registration_redesign_experiment.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class FreeTrialRegistrationRedesignExperiment < ApplicationExperiment
- control
- variant(:candidate)
-
- private
-
- def control_behavior; end
- def candidate_behavior; end
-end
diff --git a/ee/app/services/registrations/base_namespace_create_service.rb b/ee/app/services/registrations/base_namespace_create_service.rb
index 80fe07b912c43380c7c8be10dd17936e954aa336..ae7c13ac7e16018c1bfbefdf26659dcfa6cb78eb 100644
--- a/ee/app/services/registrations/base_namespace_create_service.rb
+++ b/ee/app/services/registrations/base_namespace_create_service.rb
@@ -20,10 +20,7 @@ def after_successful_group_creation(group_track_action:)
experiment(:phone_verification_for_low_risk_users, user: user).track(:assignment, namespace: group)
- if onboarding_status.trial?
- experiment(:free_trial_registration_redesign, actor: user).track(:assignment, namespace: group)
- experiment(:trial_discover_page, actor: user).track(:assignment, namespace: group)
- end
+ experiment(:trial_discover_page, actor: user).track(:assignment, namespace: group) if onboarding_status.trial?
apply_trial if onboarding_status.trial_onboarding_flow?
end
diff --git a/ee/app/views/trial_registrations/_new.html.haml b/ee/app/views/trial_registrations/_new.html.haml
deleted file mode 100644
index 8961595e20849131491450438e0695f01756bf0c..0000000000000000000000000000000000000000
--- a/ee/app/views/trial_registrations/_new.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-- content_for :omniauth_providers_top do
- = render 'trial_registrations/signup_omniauth_provider_list'
-
-.row.gl-align-items-center
- .col-lg-6.gl-display-none.gl-lg-display-flex.gl-flex-direction-column.gl-align-items-center.gl-justify-content-start
- %div
- = render 'shared/trial_reassurances'
- .col-md-6.offset-md-3.offset-lg-0
- %h2.gl-lg-display-none.gl-mb-3.gl-mt-0.gl-text-gray-800
- = s_('InProductMarketing|Start your 30-day free trial')
- %p.gl-lg-display-none.gl-font-lg.gl-text-gray-800
- = s_('InProductMarketing|No credit card required')
-
- .signup-page
- = render 'devise/shared/signup_box',
- borderless: true,
- url: trial_registrations_path(glm_tracking_params),
- button_text: _('Continue'),
- show_omniauth_providers: social_signin_enabled?,
- tracking_label: registration_tracking_label(trial: true)
-
- = render 'devise/shared/sign_in_link'
-
- %p.gl-text-center
- = s_('InProductMarketing|Want to host GitLab on your servers?')
- = link_to s_('InProductMarketing|Start a Self-Managed trial'),
- 'https://about.gitlab.com/free-trial/#selfmanaged/',
- data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }
diff --git a/ee/app/views/trial_registrations/_new_design.html.haml b/ee/app/views/trial_registrations/_new_design.html.haml
deleted file mode 100644
index 08520022e9beff3963905d96d4134abf1ea87e01..0000000000000000000000000000000000000000
--- a/ee/app/views/trial_registrations/_new_design.html.haml
+++ /dev/null
@@ -1,58 +0,0 @@
-- content_for :omniauth_providers_top do
- .gl-pt-5.gl-max-w-75
- %label.gl-font-weight-normal
- = _('Sign up for your free trial with:')
- .gl-display-flex.gl-gap-3
- - popular_enabled_button_based_providers.each do |provider|
- = render 'devise/shared/signup_omniauth_provider_button',
- href: omniauth_authorize_path(:user, provider, register_omniauth_params(trial: true)),
- provider: provider,
- tracking_label: registration_tracking_label(trial: true)
-
- .gl-my-5.gl-font-weight-bold.gl-max-w-75
- = _('Or create your own GitLab account')
-
-.row.marketing-styling
- .col-md-8.gl-display-flex.gl-flex-direction-column.gl-pl-120
- %h1.gl-mt-0
- - upper_tag = tag.span(class: 'gl-font-size-h2-xl')
- - lower_tag = tag.span(class: 'gl-display-block')
- = safe_format(s_('InProductMarketing|%{upper_start}Free 30-day trial%{upper_end} %{lower_start}GitLab Ultimate%{lower_end}'),
- tag_pair(upper_tag, :upper_start, :upper_end),
- tag_pair(lower_tag, :lower_start, :lower_end))
-
- .signup-box
- = render 'signup_box'
-
- .additional-links.gl-mt-6.gl-font-weight-bold
- = render 'devise/shared/sign_in_link', wrapper_class: ''
-
- %p
- = s_('InProductMarketing|Want to host GitLab on your servers?')
- = link_to s_('InProductMarketing|Start a Self-Managed trial'),
- 'https://about.gitlab.com/free-trial/#selfmanaged/',
- data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }
-
- .col-md-4.gl-lg-display-flex.gl-flex-direction-column.gl-mb-6.gl-align-items-center.gl-pr-8
- %div
- - ultimate_trial_value_props = [s_('InProductMarketing|Accelerate your digital transformation'),
- s_('InProductMarketing|Deliver software faster'),
- s_('InProductMarketing|Ensure compliance'),
- s_('InProductMarketing|Build in security'),
- s_('InProductMarketing|Improve collaboration and visibility')]
-
- %h2.gl-font-size-h2-xl.gl-font-weight-normal.gl-mb-6= s_('InProductMarketing|No credit card required.')
-
- %ul.gl-pl-0.gl-mb-7.gl-pl-0.gl-text-gray-800.check-mark-text
- - ultimate_trial_value_props.each do |value_prop|
- %li.gl-display-flex.gl-mb-3
- %span.gl-mr-3.text-brand-purple-02= sprite_icon 'check', css_class: 'gl-icon check-marks'
- = value_prop
-
- .gl-text-gray-800.gl-font-sm
- = s_('InProductMarketing|Trusted by')
-
- .gl-mt-5.gl-display-flex.gl-gap-6.gl-flex-wrap
- - TrialRegistrationsHelper::TRUSTED_BY_LOGOS.each do |logo|
- .gl-display-flex.gl-align-items-center
- = image_tag(logo[:path], alt: logo[:alt], title: logo[:title], width: 100)
diff --git a/ee/app/views/trial_registrations/new.html.haml b/ee/app/views/trial_registrations/new.html.haml
index 3f84700954d0ca991c16613197a1ba02435782ae..f1de9c9f4e3d0ef65492769ee65ce5288f05ffa0 100644
--- a/ee/app/views/trial_registrations/new.html.haml
+++ b/ee/app/views/trial_registrations/new.html.haml
@@ -9,10 +9,64 @@
= render 'devise/shared/minimal_footer'
= render "layouts/google_tag_manager_body"
+- @body_class = 'marketing-background-gradient'
+
+- content_for :omniauth_providers_top do
+ .gl-pt-5.gl-max-w-75
+ %label.gl-font-weight-normal
+ = _('Sign up for your free trial with:')
+ .gl-display-flex.gl-gap-3
+ - popular_enabled_button_based_providers.each do |provider|
+ = render 'devise/shared/signup_omniauth_provider_button',
+ href: omniauth_authorize_path(:user, provider, register_omniauth_params(trial: true)),
+ provider: provider,
+ tracking_label: registration_tracking_label(trial: true)
+
+ .gl-my-5.gl-font-weight-bold.gl-max-w-75
+ = _('Or create your own GitLab account')
+
+.row.marketing-styling
+ .col-md-8.gl-display-flex.gl-flex-direction-column.gl-pl-120
+ %h1.gl-mt-0
+ - upper_tag = tag.span(class: 'gl-font-size-h2-xl')
+ - lower_tag = tag.span(class: 'gl-display-block')
+ = safe_format(s_('InProductMarketing|%{upper_start}Free 30-day trial%{upper_end} %{lower_start}GitLab Ultimate%{lower_end}'),
+ tag_pair(upper_tag, :upper_start, :upper_end),
+ tag_pair(lower_tag, :lower_start, :lower_end))
+
+ .signup-box
+ = render 'signup_box'
+
+ .additional-links.gl-mt-6.gl-font-weight-bold
+ = render 'devise/shared/sign_in_link', wrapper_class: ''
+
+ %p
+ = s_('InProductMarketing|Want to host GitLab on your servers?')
+ = link_to s_('InProductMarketing|Start a Self-Managed trial'),
+ 'https://about.gitlab.com/free-trial/#selfmanaged/',
+ data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }
+
+ .col-md-4.gl-lg-display-flex.gl-flex-direction-column.gl-mb-6.gl-align-items-center.gl-pr-8
+ %div
+ - ultimate_trial_value_props = [s_('InProductMarketing|Accelerate your digital transformation'),
+ s_('InProductMarketing|Deliver software faster'),
+ s_('InProductMarketing|Ensure compliance'),
+ s_('InProductMarketing|Build in security'),
+ s_('InProductMarketing|Improve collaboration and visibility')]
+
+ %h2.gl-font-size-h2-xl.gl-font-weight-normal.gl-mb-6= s_('InProductMarketing|No credit card required.')
+
+ %ul.gl-pl-0.gl-mb-7.gl-pl-0.gl-text-gray-800.check-mark-text
+ - ultimate_trial_value_props.each do |value_prop|
+ %li.gl-display-flex.gl-mb-3
+ %span.gl-mr-3.text-brand-purple-02= sprite_icon 'check', css_class: 'gl-icon check-marks'
+ = value_prop
+
+ .gl-text-gray-800.gl-font-sm
+ = s_('InProductMarketing|Trusted by')
+
+ .gl-mt-5.gl-display-flex.gl-gap-6.gl-flex-wrap
+ - TrialRegistrationsHelper::TRUSTED_BY_LOGOS.each do |logo|
+ .gl-display-flex.gl-align-items-center
+ = image_tag(logo[:path], alt: logo[:alt], title: logo[:title], width: 100)
-- experiment(:free_trial_registration_redesign, actor: current_user) do |e|
- - e.control do
- = render 'new'
- - e.candidate do
- - @body_class = 'marketing-background-gradient'
- = render 'new_design'
diff --git a/ee/config/feature_flags/experiment/free_trial_registration_redesign.yml b/ee/config/feature_flags/experiment/free_trial_registration_redesign.yml
deleted file mode 100644
index 1cd7c69055cd6c97d4edc522c43b8577cbd32a4a..0000000000000000000000000000000000000000
--- a/ee/config/feature_flags/experiment/free_trial_registration_redesign.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: free_trial_registration_redesign
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121269
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425215
-milestone: '16.6'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/ee/spec/experiments/free_trial_registration_redesign_experiment_spec.rb b/ee/spec/experiments/free_trial_registration_redesign_experiment_spec.rb
deleted file mode 100644
index b25b0874b7d2708a8d1fb545277e99d43c1513e4..0000000000000000000000000000000000000000
--- a/ee/spec/experiments/free_trial_registration_redesign_experiment_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe FreeTrialRegistrationRedesignExperiment, :experiment, feature_category: :acquisition do
- context 'with candidate experience' do
- before do
- stub_experiments(free_trial_registration_redesign: :candidate)
- end
-
- it 'registers the behavior' do
- expect(experiment(:free_trial_registration_redesign)).to register_behavior(:candidate).with(nil)
- expect { experiment(:free_trial_registration_redesign).run }.not_to raise_error
- end
- end
-
- context 'with control experience' do
- before do
- stub_experiments(free_trial_registration_redesign: :control)
- end
-
- it 'registers the behavior' do
- expect(experiment(:free_trial_registration_redesign)).to register_behavior(:control).with(nil)
- expect { experiment(:free_trial_registration_redesign).run }.not_to raise_error
- end
- end
-end
diff --git a/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb b/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
index 32b0a3e735bbd1c7af5f58644236af92082b11fe..067f92c90f1287462221f47e6e6e6a1c22012a0d 100644
--- a/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
@@ -11,7 +11,7 @@
end
with_them do
- it 'registers the user and creates a group and project reaching onboarding', :snowplow_micro, :sidekiq_inline do
+ it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
sign_up_method.call(glm_params)
ensure_onboarding { expect_to_see_welcome_form }
@@ -41,43 +41,6 @@
click_on 'Ok, let\'s go'
expect_to_be_in_learn_gitlab
- expect(tracking_events_key).to have_all_expected_events
- end
-
- context 'with free_trial_registration_redesign experiment candidate' do
- it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
- stub_experiments(free_trial_registration_redesign: :candidate)
-
- sign_up_method.call(glm_params)
-
- ensure_onboarding { expect_to_see_welcome_form }
-
- fills_in_welcome_form
- click_on 'Continue'
-
- ensure_onboarding { expect_to_see_company_form }
-
- # failure
- fill_in_company_form(success: false, trial: true)
- click_on 'Continue'
-
- expect_to_see_company_form_failure
-
- # success
- fill_in_company_form(success: true, trial: true)
- click_on 'Continue'
-
- ensure_onboarding { expect_to_see_group_and_project_creation_form }
-
- fills_in_group_and_project_creation_form_with_trial
- click_on 'Create project'
-
- expect_to_be_in_continuous_onboarding
-
- click_on 'Ok, let\'s go'
-
- expect_to_be_in_learn_gitlab
- end
end
end
diff --git a/ee/spec/services/registrations/standard_namespace_create_service_spec.rb b/ee/spec/services/registrations/standard_namespace_create_service_spec.rb
index 5291d5f8101c887ae562435d42ef255c6c8ce3fc..9d35a5b7ab5a031076ef52765fa1de88864f705a 100644
--- a/ee/spec/services/registrations/standard_namespace_create_service_spec.rb
+++ b/ee/spec/services/registrations/standard_namespace_create_service_spec.rb
@@ -101,21 +101,6 @@
expect(execute).to be_success
end
- context 'with free_trial_registration_redesign experiment not called' do
- subject(:service) { described_class.new(user, params) }
-
- before do
- stub_saas_features(onboarding: true)
- end
-
- it 'does not call the experiment DSL' do
- allow(service).to receive(:experiment).and_call_original
- expect(service).not_to receive(:experiment).with(:free_trial_registration_redesign, actor: user)
-
- expect(service.execute).to be_success
- end
- end
-
context 'with trial_discover_page experiment not called' do
subject(:service) { described_class.new(user, params) }
@@ -261,21 +246,6 @@
end
end
- context 'with free_trial_registration_redesign experiment called' do
- subject(:service) { described_class.new(user, params) }
-
- before do
- stub_saas_features(onboarding: true)
- end
-
- it 'tracks experiment assignment event' do
- allow(service).to receive(:experiment).and_call_original
- expect(service).to receive(:experiment).with(:free_trial_registration_redesign, actor: user)
-
- expect(service.execute).to be_success
- end
- end
-
context 'with trial_discover_page experiment called' do
subject(:service) { described_class.new(user, params) }
diff --git a/ee/spec/support/helpers/saas_registration_helpers.rb b/ee/spec/support/helpers/saas_registration_helpers.rb
index d3d9e37bf3b917ec6828db53ad7583cd83a9ee7a..702cd31af0abb9b914823ccd8c12d8ec0b378f31 100644
--- a/ee/spec/support/helpers/saas_registration_helpers.rb
+++ b/ee/spec/support/helpers/saas_registration_helpers.rb
@@ -264,7 +264,7 @@ def expect_to_see_import_form
end
def expect_to_be_on_trial_user_registration
- expect(page).to have_content('Start your 30-day free trial')
+ expect(page).to have_content('Free 30-day trial')
end
def expect_to_be_on_user_sign_in
diff --git a/ee/spec/views/trial_registrations/new.html.haml_spec.rb b/ee/spec/views/trial_registrations/new.html.haml_spec.rb
index c64ab65c3f081c1325eedad802d7b69f2c0f2452..8bb05444e8e2784ed1b94024429b47e1d9de3990 100644
--- a/ee/spec/views/trial_registrations/new.html.haml_spec.rb
+++ b/ee/spec/views/trial_registrations/new.html.haml_spec.rb
@@ -14,30 +14,11 @@
subject { render && rendered }
- context 'when free_trial_registration_redesign is control' do
- before do
- stub_experiments(free_trial_registration_redesign: :control)
- end
+ it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
+ it { is_expected.to have_content(s_('InProductMarketing|Free 30-day trial')) }
+ it { is_expected.to have_content(s_('InProductMarketing|GitLab Ultimate')) }
+ it { is_expected.to have_content(s_('InProductMarketing|No credit card required.')) }
- it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
- it { is_expected.to have_content(s_('InProductMarketing|Start your 30-day free trial')) }
- it { is_expected.to have_content(s_('InProductMarketing|No credit card required')) }
-
- it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
- it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
- end
-
- context 'when free_trial_registration_redesign is candidate' do
- before do
- stub_experiments(free_trial_registration_redesign: :candidate)
- end
-
- it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
- it { is_expected.to have_content(s_('InProductMarketing|Free 30-day trial')) }
- it { is_expected.to have_content(s_('InProductMarketing|GitLab Ultimate')) }
- it { is_expected.to have_content(s_('InProductMarketing|No credit card required.')) }
-
- it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
- it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
- end
+ it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
+ it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
end