Merge branch...

Merge branch '119015-adjust-skip-trial-copy-in-trial-sign-up-flow-for-saas-users-who-are-logged-in' into 'master'

Adjust skip trial copy in trial sign up flow for SaaS users who are logged in

See merge request gitlab-org/gitlab!22923

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

 .my-5
-  = link_to _('Skip Trial (Continue with Free Account)'), dashboard_projects_path, class: 'block center py-2'
+  - if params[:glm_source] == 'gitlab.com'
+    = link_to s_('Trials|Go back to GitLab'), dashboard_projects_path, class: 'block center py-2'
     .label
-    = _("You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'.")
+      = s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'")
+  - else
+    = link_to s_('Trials|Skip Trial (Continue with Free Account)'), dashboard_projects_path, class: 'block center py-2'
+    .label
+      = s_("Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'")

ee/changelogs/unreleased/119015-adjust-skip-trial-copy-in-trial-sign-up-flow-for-saas-users-who.yml

+---
+title: Adjust skip trial copy in trial sign up flow for SaaS users who are logged
+  in
+merge_request: 22923
+author:
+type: changed

ee/spec/views/trials/_skip_trial.html.haml_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'trials/_skip_trial.html.haml' do
+  include ApplicationHelper
+
+  context 'without glm_source' do
+    it 'displays skip trial' do
+      render 'trials/skip_trial'
+
+      expect(rendered).to have_content("Skip Trial (Continue with Free Account)")
+    end
+  end
+
+  context 'with glm_source' do
+    it 'displays skip trial when using about.gitlab.com' do
+      params[:glm_source] = 'about.gitlab.com'
+
+      render 'trials/skip_trial'
+
+      expect(rendered).to have_content("Skip Trial (Continue with Free Account)")
+    end
+
+    it 'displays go back to GitLab when using GitLab.com' do
+      params[:glm_source] = 'gitlab.com'
+
+      render 'trials/skip_trial'
+
+      expect(rendered).to have_content("Go back to GitLab")
+    end
+  end
+end

locale/gitlab.pot

@@ -17368,9 +17368,6 @@ msgstr ""
 msgid "Size settings for static websites"
 msgstr ""
 
-msgid "Skip Trial (Continue with Free Account)"
-msgstr ""
-
 msgid "Skip this for now"
 msgstr ""
 
@@ -20016,6 +20013,18 @@ msgstr ""
 msgid "Trending"
 msgstr ""
 
+msgid "Trials|Go back to GitLab"
+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'"
+msgstr ""
+
+msgid "Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'"
+msgstr ""
+
 msgid "Trigger"
 msgstr ""
 
@@ -21811,9 +21820,6 @@ msgstr ""
 msgid "You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
 msgstr ""
 
-msgid "You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'."
-msgstr ""
-
 msgid "You'll be signed out from your current account automatically."
 msgstr ""