Merge branch '36747-update-billing-page-trial-ctas' into 'master'

Update billing page trial CTAs

See merge request gitlab-org/gitlab!20383

ee/app/views/shared/_gold_trial_callout_content.html.haml

@@ -13,7 +13,7 @@
           %p.mb-0
             %span= _('Try all GitLab has to offer for 30 days.')
             %span.d-none.d-sm-inline= _('No credit card required.')
-        = link_to _('Start your trial'), "#{EE::SUBSCRIPTIONS_URL}/trials/new?gl_com=true", class: "btn btn-primary mt-2 mt-sm-0 #{button_css_class}", target: '_blank'
+        = link_to _('Start your trial'), new_trial_registration_path, class: "btn btn-primary mt-2 mt-sm-0 #{button_css_class}", target: '_blank'
 
       - if is_dismissable
         %button.btn.btn-default.close.js-close{ type: 'button',

ee/app/views/shared/billings/_billing_plan_header.html.haml

 - parent_group = local_assigns[:parent_group]
 
-.mb-2= render_billings_gold_trial(current_user, parent_group || namespace)
-
 - if namespace_for_user?(namespace)
   = render_if_exists 'trials/banner', namespace: namespace
 

ee/changelogs/unreleased/36747-update-billing-page-trial-ctas.yml

+---
+title: Update billing page trial CTAs
+merge_request: 20383
+author:
+type: changed

ee/spec/features/billings/billing_plans_spec.rb

@@ -85,8 +85,6 @@ describe 'Billing plan pages', :feature do
   context 'users profile billing page' do
     let(:page_path) { profile_billings_path }
 
-    it_behaves_like 'billings gold trial callout'
-
     context 'on free' do
       let(:plan) { free_plan }
 
@@ -177,8 +175,6 @@ describe 'Billing plan pages', :feature do
     context 'top-most group' do
       let(:page_path) { group_billings_path(namespace) }
 
-      it_behaves_like 'billings gold trial callout'
-
       context 'on bronze' do
         let(:plan) { bronze_plan }
 
@@ -221,8 +217,6 @@ describe 'Billing plan pages', :feature do
     let(:page_path) { group_billings_path(subgroup2) }
     let(:namespace) { group }
 
-    it_behaves_like 'billings gold trial callout'
-
     context 'on bronze' do
       let(:plan) { bronze_plan }