Merge branch '299870-update-gold-mentions' into 'master'

Replaced Gold mentions with Ultimate

See merge request gitlab-org/gitlab!52501

app/views/layouts/header/_current_user_dropdown.html.haml

@@ -28,7 +28,7 @@
   - if current_user_menu?(:start_trial)
     %li
       %a.trial-link{ href: trials_link_url }
-        = s_("CurrentUser|Start a Gold trial")
+        = s_("CurrentUser|Start an Ultimate trial")
         = emoji_icon('rocket')
   - if current_user_menu?(:settings)
     %li

ee/app/controllers/registrations/projects_controller.rb

@@ -40,7 +40,7 @@ module Registrations
 
     def create_learn_gitlab_project
       title, filename = if helpers.in_trial_onboarding_flow?
-                          [s_('Learn GitLab - Gold trial'), 'learn_gitlab_gold_trial.tar.gz']
+                          [s_('Learn GitLab - Ultimate trial'), 'learn_gitlab_gold_trial.tar.gz']
                         else
                           [s_('Learn GitLab'), 'learn_gitlab.tar.gz']
                         end

ee/app/helpers/ee/trial_helper.rb

@@ -31,7 +31,7 @@ module EE
       elsif any_trial_group_namespaces?
         s_('Trials|You can apply your trial to a new group or an existing group.')
       else
-        s_('Trials|Create a new group to start your GitLab Gold trial.')
+        s_('Trials|Create a new group to start your GitLab Ultimate trial.')
       end
     end
 

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

 - faq_link          = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
 - pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing"
 
-
 - if namespace.eligible_for_trial?
-  = html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold.")) % { faq_link: faq_link.html_safe }
+  = html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Ultimate.")) % { faq_link: faq_link.html_safe }
 - elsif namespace.trial_active?
   = html_escape(s_("BillingPlans|Your GitLab.com %{plan} trial will %{strong_open}expire after %{expiration_date}%{strong_close}. You can retain access to the %{plan} features by upgrading below.")) % { plan: namespace.gitlab_subscription&.plan_title, expiration_date: namespace.trial_ends_on, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
 - elsif namespace.trial_expired? && namespace.free_plan?

ee/app/views/shared/groups/_trial_form.html.haml

 .row
   .form-group.col-sm-12
-    = label_tag :trial_toggle, s_('Trial|GitLab Gold trial (optional)'), for: :trial_toggle, class: 'col-form-label'
+    = label_tag :trial_toggle, s_('Trial|GitLab Ultimate trial (optional)'), for: :trial_toggle, class: 'col-form-label'
     %p= html_escape(('Try all GitLab features for free for 30 days.%{br_tag}No credit card required.')) % { br_tag: '<br/>'.html_safe }
     .js-trial-toggle{ data: { active: params[:trial] == 'true' } }
     %p.gl-text-gray-500.gl-mt-3= s_('Trial|We will activate your trial on your group after you complete this step. After 30 days, you can:')
     %ul.gl-pl-5
-      %li.gl-text-gray-500= s_('Trial|Upgrade to Gold to keep using GitLab with advanced features.')
+      %li.gl-text-gray-500= s_('Trial|Upgrade to Ultimate to keep using GitLab with advanced features.')
       %li.gl-text-gray-500= s_('Trial|Continue using the basic features of GitLab for free.')
 .js-trial-form.hidden
   .row

ee/app/views/trial_registrations/new.html.haml

-- page_title _('Start a Free Gold Trial')
+- page_title _('Start a Free Ultimate Trial')
 - add_page_specific_style 'page_bundles/signup'
 - content_for :page_specific_javascripts do
   = render "layouts/google_tag_manager_head"
 = render "layouts/google_tag_manager_body"
 
 %h2.center.pt-6.pb-4.gl-mb-0
-  = _('Start a Free Gold Trial')
+  = _('Start a Free Ultimate Trial')
 
 .signup-page
   = render 'devise/shared/signup_box',

ee/app/views/trials/_skip_trial.html.haml

@@ -2,7 +2,7 @@
   - if params[:glm_source] == 'gitlab.com'
     = link_to s_('Trials|Go back to GitLab'), dashboard_projects_path, class: 'block center py-2'
     .label
-      = s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'")
+      = s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'")
   - else
     - trial_text = experiment_enabled?(:trimmed_skip_trial_copy) ? s_('Trials|Skip Trial') : s_('Trials|Skip Trial (Continue with Free Account)')
     = link_to trial_text, dashboard_projects_path, class: 'block center py-2'

ee/app/views/trials/new.html.haml

-- page_title _('Start your Free Gold Trial')
+- page_title _('Start your Free Ultimate Trial')
 - glm_params = { glm_source: params[:glm_source], glm_content: params[:glm_content] }
 
 %h3.center.pt-6
-  = _('Start your Free Gold Trial')
+  = _("Start your Free Ultimate Trial")
 
 %p.center
-  = _('Your Gitlab Gold trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial.')
+  = _('Your Gitlab Ultimate trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial.')
 
 = render 'errors'
 

ee/app/views/trials/select.html.haml

-- page_title _('Start a Free Gold Trial')
+- page_title _('Start a Free Ultimate Trial')
 - content_for :page_specific_javascripts do
   = render "layouts/google_tag_manager_head"
 = render "layouts/google_tag_manager_body"

ee/spec/controllers/registrations/projects_controller_spec.rb

@@ -84,10 +84,10 @@ RSpec.describe Registrations::ProjectsController do
           { learn_gitlab_project_id: project.id, namespace_id: project.namespace_id, project_id: first_project.id }
         end
 
-        it 'creates a new project, a "Learn GitLab - Gold trial" project, does not set a cookie' do
-          expect { subject }.to change { namespace.projects.pluck(:name) }.from([]).to(['New project', s_('Learn GitLab - Gold trial')])
+        it 'creates a new project, a "Learn GitLab - Ultimate trial" project, does not set a cookie' do
+          expect { subject }.to change { namespace.projects.pluck(:name) }.from([]).to(['New project', s_('Learn GitLab - Ultimate trial')])
           expect(subject).to have_gitlab_http_status(:redirect)
-          expect(namespace.projects.find_by_name(s_('Learn GitLab - Gold trial'))).to be_import_finished
+          expect(namespace.projects.find_by_name(s_('Learn GitLab - Ultimate trial'))).to be_import_finished
           expect(cookies[:onboarding_issues_settings]).to be_nil
         end
 

ee/spec/features/dashboards/activity_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard activity' do
   let(:user) { create(:user) }
   let(:page_path) { activity_dashboard_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/dashboards/groups_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard groups' do
   let(:user) { create(:user) }
   let(:page_path) { dashboard_groups_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/dashboards/issues_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard issues' do
   let(:user) { create(:user) }
   let(:page_path) { issues_dashboard_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/dashboards/merge_requests_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard merge requests' do
   let(:user) { create(:user) }
   let(:page_path) { merge_requests_dashboard_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/dashboards/projects_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard projects' do
   let(:user) { create(:user) }
   let(:page_path) { dashboard_projects_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/dashboards/todos_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe 'Dashboard todos' do
   let_it_be(:user) { create(:user) }
   let(:page_path) { dashboard_todos_path }
 
-  it_behaves_like 'dashboard gold trial callout'
+  it_behaves_like 'dashboard ultimate trial callout'
 end

ee/spec/features/registrations/trial_during_signup_flow_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'User sees new onboarding flow', :js do
     choose 'Just me'
     click_on 'Continue'
 
-    expect(page).to have_content('GitLab Gold trial (optional)')
+    expect(page).to have_content('GitLab Ultimate trial (optional)')
   end
 
   it 'shows the expected behavior with no trial chosen' do

ee/spec/features/trial_registrations/signup_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe 'Trial Sign Up' do
         click_button 'Continue'
 
         expect(current_path).to eq(new_trial_path)
-        expect(page).to have_content('Start your Free Gold Trial')
+        expect(page).to have_content('Start your Free Ultimate Trial')
       end
     end
 

ee/spec/frontend/billings/subscriptions/store/__snapshots__/mutations_spec.js.snap

@@ -9,7 +9,7 @@ Array [
 ]
 `;
 
-exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Gold subscription it updates table default with subscription plan 1`] = `
+exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Ultimate subscription it updates table default with subscription plan 1`] = `
 Array [
   Object {
     "maxSeatsUsed": 104,
@@ -26,7 +26,7 @@ Array [
 ]
 `;
 
-exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Gold trial it updates table trial with subscription plan 1`] = `
+exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Ultimate trial it updates table trial with subscription plan 1`] = `
 Array [
   Object {
     "seatsInUse": 1,

ee/spec/frontend/billings/subscriptions/store/mutations_spec.js

@@ -51,10 +51,10 @@ describe('EE billings subscription module mutations', () => {
       state.tables[key].rows.map(({ columns }) => getColumnValues(columns));
 
     describe.each`
-      desc                        | subscription                  | tableKey
-      ${'with Gold subscription'} | ${mockDataSubscription.gold}  | ${TABLE_TYPE_DEFAULT}
-      ${'with Free plan'}         | ${mockDataSubscription.free}  | ${TABLE_TYPE_FREE}
-      ${'with Gold trial'}        | ${mockDataSubscription.trial} | ${TABLE_TYPE_TRIAL}
+      desc                            | subscription                  | tableKey
+      ${'with Ultimate subscription'} | ${mockDataSubscription.gold}  | ${TABLE_TYPE_DEFAULT}
+      ${'with Free plan'}             | ${mockDataSubscription.free}  | ${TABLE_TYPE_FREE}
+      ${'with Ultimate trial'}        | ${mockDataSubscription.trial} | ${TABLE_TYPE_TRIAL}
     `('$desc', ({ subscription, tableKey }) => {
       beforeEach(() => {
         state.isLoadingSubscription = true;

ee/spec/helpers/ee/trial_helper_spec.rb

@@ -132,7 +132,7 @@ RSpec.describe EE::TrialHelper do
       true  | true  | 'You can apply your trial to a new group, an existing group, or your personal account.'
       true  | false | 'You can apply your trial to a new group or your personal account.'
       false | true  | 'You can apply your trial to a new group or an existing group.'
-      false | false | 'Create a new group to start your GitLab Gold trial.'
+      false | false | 'Create a new group to start your GitLab Ultimate trial.'
     end
 
     with_them do

ee/spec/support/shared_examples/features/gold_trial_callout_shared_examples.rb

 # frozen_string_literal: true
 
-RSpec.shared_examples 'dashboard gold trial callout' do
+RSpec.shared_examples 'dashboard ultimate trial callout' do
   before do
     sign_in(user)
   end
@@ -62,7 +62,7 @@ RSpec.shared_examples 'dashboard gold trial callout' do
   end
 end
 
-RSpec.shared_examples 'billings gold trial callout' do
+RSpec.shared_examples 'billings ultimate trial callout' do
   context 'on a free plan' do
     let(:plan) { free_plan }
 
@@ -74,13 +74,13 @@ RSpec.shared_examples 'billings gold trial callout' do
       visit page_path
     end
 
-    it 'renders an undismissable gold trial callout' do
+    it 'renders an undismissable ultimate trial callout' do
       expect(page).to have_selector '.promotion-callout'
       expect(page).not_to have_selector '.promotion-callout .js-close'
     end
   end
 
-  context "on a plan that isn't gold", :js do
+  context "on a plan that isn't ultimate", :js do
     let(:plans) { { bronze: create(:bronze_plan), silver: create(:silver_plan) } }
 
     where(case_names: ->(plan_type) {"like #{plan_type}"}, plan_type: [:bronze, :silver])
@@ -96,7 +96,7 @@ RSpec.shared_examples 'billings gold trial callout' do
         visit page_path
       end
 
-      it 'renders a dismissable gold trial callout' do
+      it 'renders a dismissable ultimate trial callout' do
         expect(page).to have_selector '.promotion-callout'
 
         find('.promotion-callout .js-close').click
@@ -106,7 +106,7 @@ RSpec.shared_examples 'billings gold trial callout' do
     end
   end
 
-  context 'on a gold plan' do
+  context 'on a ultimate plan' do
     let(:plan) { gold_plan }
 
     let!(:subscription) do
@@ -117,7 +117,7 @@ RSpec.shared_examples 'billings gold trial callout' do
       visit page_path
     end
 
-    it "doesn't render a gold trial callout" do
+    it "doesn't render a ultimate trial callout" do
       expect(page).not_to have_selector '.promotion-callout'
     end
   end

ee/spec/views/shared/billings/_trial_status.html.haml_spec.rb

@@ -25,13 +25,13 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
     let(:trial_ends_on) { Date.tomorrow }
     let(:trial) { true }
 
-    context 'with a gold trial' do
-      let(:plan) { create(:gold_plan, title: 'Gold') }
+    context 'with a ultimate trial' do
+      let(:plan) { create(:gold_plan, title: 'Ultimate') }
 
-      it 'displays expiry date and Gold' do
+      it 'displays expiry date and Ultimate' do
         render 'shared/billings/trial_status', namespace: group
 
-        expect(rendered).to have_content("Your GitLab.com Gold trial will expire after #{trial_ends_on}. You can retain access to the Gold features by upgrading below.")
+        expect(rendered).to have_content("Your GitLab.com Ultimate trial will expire after #{trial_ends_on}. You can retain access to the Ultimate features by upgrading below.")
       end
     end
 
@@ -65,7 +65,7 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
     it 'offers a trial' do
       render 'shared/billings/trial_status', namespace: group
 
-      expect(rendered).to have_content("start a free 30-day trial of GitLab.com Gold")
+      expect(rendered).to have_content("start a free 30-day trial of GitLab.com Ultimate")
     end
   end
 end

locale/gitlab.pot

@@ -4466,7 +4466,7 @@ msgstr ""
 msgid "BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}."
 msgstr ""
 
-msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."
+msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Ultimate."
 msgstr ""
 
 msgid "BillingPlans|Learn more about each plan by visiting our %{pricing_page_link}."
@@ -8552,7 +8552,7 @@ msgstr ""
 msgid "CurrentUser|Settings"
 msgstr ""
 
-msgid "CurrentUser|Start a Gold trial"
+msgid "CurrentUser|Start an Ultimate trial"
 msgstr ""
 
 msgid "CurrentUser|Upgrade"
@@ -16678,7 +16678,7 @@ msgstr ""
 msgid "Learn GitLab"
 msgstr ""
 
-msgid "Learn GitLab - Gold trial"
+msgid "Learn GitLab - Ultimate trial"
 msgstr ""
 
 msgid "Learn how to %{link_start}contribute to the built-in templates%{link_end}"
@@ -26968,7 +26968,7 @@ msgstr ""
 msgid "Start a %{new_merge_request} with these changes"
 msgstr ""
 
-msgid "Start a Free Gold Trial"
+msgid "Start a Free Ultimate Trial"
 msgstr ""
 
 msgid "Start a new discussion..."
@@ -27010,7 +27010,7 @@ msgstr ""
 msgid "Start thread & reopen %{noteable_name}"
 msgstr ""
 
-msgid "Start your Free Gold Trial"
+msgid "Start your Free Ultimate Trial"
 msgstr ""
 
 msgid "Start your free trial"
@@ -30077,7 +30077,7 @@ msgid_plural "Trials|%{plan} Trial %{en_dash} %{num} days left"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Trials|Create a new group to start your GitLab Gold trial."
+msgid "Trials|Create a new group to start your GitLab Ultimate trial."
 msgstr ""
 
 msgid "Trials|Go back to GitLab"
@@ -30089,7 +30089,7 @@ msgstr ""
 msgid "Trials|Skip Trial (Continue with Free Account)"
 msgstr ""
 
-msgid "Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'"
+msgid "Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'"
 msgstr ""
 
 msgid "Trials|You can apply your trial to a new group or an existing group."
@@ -30116,7 +30116,7 @@ msgstr ""
 msgid "Trial|Dismiss"
 msgstr ""
 
-msgid "Trial|GitLab Gold trial (optional)"
+msgid "Trial|GitLab Ultimate trial (optional)"
 msgstr ""
 
 msgid "Trial|How many employees will use Gitlab?"
@@ -30131,7 +30131,7 @@ msgstr ""
 msgid "Trial|Telephone number"
 msgstr ""
 
-msgid "Trial|Upgrade to Gold to keep using GitLab with advanced features."
+msgid "Trial|Upgrade to Ultimate to keep using GitLab with advanced features."
 msgstr ""
 
 msgid "Trial|We will activate your trial on your group after you complete this step. After 30 days, you can:"
@@ -32900,7 +32900,7 @@ msgstr ""
 msgid "Your GitLab group"
 msgstr ""
 
-msgid "Your Gitlab Gold trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial."
+msgid "Your Gitlab Ultimate trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial."
 msgstr ""
 
 msgid "Your Groups"