diff --git a/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab.vue b/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab.vue
index db7fe868b68631ceb0b65e70a18887226e860114..0953c39e51dbd899fca6b9c9be7f7eba186fbf00 100644
--- a/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab.vue
+++ b/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab.vue
@@ -19,15 +19,13 @@ export default {
},
i18n: {
title: s__('LearnGitLab|Learn GitLab'),
- description: s__(
- 'LearnGitLab|Ready to get started with GitLab? Follow these steps to set up your workspace, plan and commit changes, and deploy your project.',
- ),
+ description: s__('LearnGitLab|Follow these steps to get familiar with the GitLab workflow.'),
percentageCompleted: s__(`LearnGitLab|%{percentage}%{percentSymbol} completed`),
successfulInvitations: s__(
"LearnGitLab|Your team is growing! You've successfully invited new team members to the %{projectName} project.",
),
- addCodeBlockTitle: s__('LearnGitLab|1. Add code to your project'),
- buildBlockTitle: s__('LearnGitLab|2. Build'),
+ addCodeBlockTitle: s__('LearnGitLab|Get started'),
+ buildBlockTitle: s__('LearnGitLab|Next steps'),
},
props: {
actions: {
diff --git a/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue b/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue
index 2fac2a24654f54397036be7ccc098dc4c540ecd6..b9dcff8b9f6b2834836906560f7aa362419c5d9c 100644
--- a/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue
+++ b/ee/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue
@@ -60,7 +60,7 @@ export default {
</script>
<template>
<div class="gl-mb-2">
- <div class="flex gl-align-items-center">
+ <div class="gl-flex gl-items-center">
<span v-if="value.completed" class="gl-text-green-500">
<gl-icon name="check-circle-filled" :size="16" data-testid="completed-icon" />
{{ actionLabelValue('title') }}
diff --git a/ee/app/assets/javascripts/pages/projects/learn_gitlab/constants/index.js b/ee/app/assets/javascripts/pages/projects/learn_gitlab/constants/index.js
index 4458ac6ae4ce88e346811b7e80191e21a1d05e37..a0ab349558b9a81d1c620b22b1fda87c9f667b75 100644
--- a/ee/app/assets/javascripts/pages/projects/learn_gitlab/constants/index.js
+++ b/ee/app/assets/javascripts/pages/projects/learn_gitlab/constants/index.js
@@ -5,7 +5,7 @@ export const ACTION_LABELS = {
title: s__('LearnGitLab|Add code'),
trackLabel: 'add_code',
section: 'code',
- position: 0,
+ position: 1,
openInNewTab: true,
},
gitWrite: {
@@ -13,8 +13,8 @@ export const ACTION_LABELS = {
actionLabel: s__('LearnGitLab|Create a repository'),
description: s__('LearnGitLab|Create or import your first repository into your new project.'),
trackLabel: 'create_a_repository',
- section: 'workspace',
- position: 1,
+ section: 'code',
+ position: 0,
},
userAdded: {
title: s__('LearnGitLab|Invite your colleagues'),
@@ -108,27 +108,25 @@ export const ACTION_LABELS = {
export const ACTION_SECTIONS = {
code: {
- title: s__('LearnGitLab|Add code'),
+ title: s__('LearnGitLab|Set up your code'),
description: s__(
'LearnGitLab|Use the built-in editor, WebIDE, or upload code using your preferred method.',
),
},
workspace: {
- title: s__('LearnGitLab|Set up your workspace'),
+ title: s__('LearnGitLab|Configure your project'),
description: s__(
"LearnGitLab|Complete these tasks first so you can enjoy GitLab's features to their fullest:",
),
},
plan: {
- title: s__('LearnGitLab|Plan and execute'),
- description: s__(
- 'LearnGitLab|Create a workflow for your new workspace, and learn how GitLab features work together:',
- ),
+ title: s__('LearnGitLab|Plan and execute work together'),
+ description: s__('LearnGitLab|Create a workflow, and learn how GitLab features work together:'),
},
deploy: {
- title: s__('LearnGitLab|Deploy'),
+ title: s__('LearnGitLab|Secure your deployment'),
description: s__(
- 'LearnGitLab|Use your new GitLab workflow to deploy your application, monitor its health, and keep it secure:',
+ 'LearnGitLab|Use GitLab to deploy your application, monitor its health, and keep it secure:',
),
},
};
diff --git a/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_section_card_spec.js.snap b/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_section_card_spec.js.snap
index 799e83efc15b6b274f968750337dbfa0bf5158c4..4ce076125e9db3fa2bed7cff1f3a28f41b9a1030 100644
--- a/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_section_card_spec.js.snap
+++ b/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_section_card_spec.js.snap
@@ -13,7 +13,7 @@ exports[`Learn GitLab Section Card renders correctly 1`] = `
<h2
class="gl-font-lg gl-mb-3"
>
- Set up your workspace
+ Configure your project
</h2>
<p
class="gl-mb-6 gl-text-gray-700"
@@ -25,7 +25,7 @@ exports[`Learn GitLab Section Card renders correctly 1`] = `
class="gl-card-body gl-pt-0"
>
<learn-gitlab-section-link-stub
- action="codeAdded"
+ action="gitWrite"
value="[object Object]"
/>
<learn-gitlab-section-link-stub
@@ -37,7 +37,7 @@ exports[`Learn GitLab Section Card renders correctly 1`] = `
value="[object Object]"
/>
<learn-gitlab-section-link-stub
- action="gitWrite"
+ action="codeAdded"
value="[object Object]"
/>
<learn-gitlab-section-link-stub
diff --git a/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap b/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
index 70be22b8c5178213ddde64241119f1b89c6437c9..9e6e6bc47fa6e10ee6bdfd140e187c93ff9abeb5 100644
--- a/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
+++ b/ee/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
@@ -16,7 +16,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<p
class="gl-mb-0 gl-text-gray-700"
>
- Ready to get started with GitLab? Follow these steps to set up your workspace, plan and commit changes, and deploy your project.
+ Follow these steps to get familiar with the GitLab workflow.
</p>
</div>
<div
@@ -40,7 +40,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-bold gl-font-size-h2"
>
- 1. Add code to your project
+ Get started
</h2>
</div>
<div
@@ -61,7 +61,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-lg gl-mb-3"
>
- Add code
+ Set up your code
</h2>
<p
class="gl-mb-6 gl-text-gray-700"
@@ -76,7 +76,30 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
+ >
+ <span
+ class="gl-text-green-500"
+ >
+ <svg
+ aria-hidden="true"
+ class="gl-fill-current gl-icon s16"
+ data-testid="completed-icon"
+ role="img"
+ >
+ <use
+ href="file-mock#check-circle-filled"
+ />
+ </svg>
+ Create a repository
+ </span>
+ </div>
+ </div>
+ <div
+ class="gl-mb-2"
+ >
+ <div
+ class="gl-flex gl-items-center"
>
<span
class="gl-text-green-500"
@@ -105,7 +128,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-bold gl-font-size-h2"
>
- 2. Build
+ Next steps
</h2>
</div>
<div
@@ -126,7 +149,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-lg gl-mb-3"
>
- Set up your workspace
+ Configure your project
</h2>
<p
class="gl-mb-6 gl-text-gray-700"
@@ -141,7 +164,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<span
class="gl-text-green-500"
@@ -164,30 +187,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
- >
- <span
- class="gl-text-green-500"
- >
- <svg
- aria-hidden="true"
- class="gl-fill-current gl-icon s16"
- data-testid="completed-icon"
- role="img"
- >
- <use
- href="file-mock#check-circle-filled"
- />
- </svg>
- Create a repository
- </span>
- </div>
- </div>
- <div
- class="gl-mb-2"
- >
- <div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -207,7 +207,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -228,7 +228,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -255,7 +255,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -296,12 +296,12 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-lg gl-mb-3"
>
- Deploy
+ Secure your deployment
</h2>
<p
class="gl-mb-6 gl-text-gray-700"
>
- Use your new GitLab workflow to deploy your application, monitor its health, and keep it secure:
+ Use GitLab to deploy your application, monitor its health, and keep it secure:
</p>
</div>
<div
@@ -311,7 +311,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -338,7 +338,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -365,7 +365,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -406,12 +406,12 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
<h2
class="gl-font-lg gl-mb-3"
>
- Plan and execute
+ Plan and execute work together
</h2>
<p
class="gl-mb-6 gl-text-gray-700"
>
- Create a workflow for your new workspace, and learn how GitLab features work together:
+ Create a workflow, and learn how GitLab features work together:
</p>
</div>
<div
@@ -421,7 +421,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
@@ -441,7 +441,7 @@ exports[`Learn GitLab Initial rendering concerns renders correctly 1`] = `
class="gl-mb-2"
>
<div
- class="flex gl-align-items-center"
+ class="gl-flex gl-items-center"
>
<div>
<a
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index df2663ec6e70dfa29b0d74a0b6b90bb33489613e..f8c7f2b5b787c8378a3ac532b7071c9b8e006a07 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -30817,12 +30817,6 @@ msgstr[1] ""
msgid "LearnGitLab|%{percentage}%{percentSymbol} completed"
msgstr ""
-msgid "LearnGitLab|1. Add code to your project"
-msgstr ""
-
-msgid "LearnGitLab|2. Build"
-msgstr ""
-
msgid "LearnGitLab|Add code"
msgstr ""
@@ -30835,10 +30829,13 @@ msgstr ""
msgid "LearnGitLab|Complete these tasks first so you can enjoy GitLab's features to their fullest:"
msgstr ""
+msgid "LearnGitLab|Configure your project"
+msgstr ""
+
msgid "LearnGitLab|Create a repository"
msgstr ""
-msgid "LearnGitLab|Create a workflow for your new workspace, and learn how GitLab features work together:"
+msgid "LearnGitLab|Create a workflow, and learn how GitLab features work together:"
msgstr ""
msgid "LearnGitLab|Create an issue"
@@ -30850,10 +30847,13 @@ msgstr ""
msgid "LearnGitLab|Create/import issues (tickets) to collaborate on ideas and plan work."
msgstr ""
-msgid "LearnGitLab|Deploy"
+msgid "LearnGitLab|Enable require merge approvals"
msgstr ""
-msgid "LearnGitLab|Enable require merge approvals"
+msgid "LearnGitLab|Follow these steps to get familiar with the GitLab workflow."
+msgstr ""
+
+msgid "LearnGitLab|Get started"
msgstr ""
msgid "LearnGitLab|GitLab works best as a team. Invite your colleague to enjoy all features."
@@ -30865,13 +30865,13 @@ msgstr ""
msgid "LearnGitLab|Learn GitLab"
msgstr ""
-msgid "LearnGitLab|Plan and execute"
+msgid "LearnGitLab|Next steps"
msgstr ""
-msgid "LearnGitLab|Prevent unexpected changes to important assets by assigning ownership of files and paths."
+msgid "LearnGitLab|Plan and execute work together"
msgstr ""
-msgid "LearnGitLab|Ready to get started with GitLab? Follow these steps to set up your workspace, plan and commit changes, and deploy your project."
+msgid "LearnGitLab|Prevent unexpected changes to important assets by assigning ownership of files and paths."
msgstr ""
msgid "LearnGitLab|Review and edit proposed changes to source code."
@@ -30889,13 +30889,16 @@ msgstr ""
msgid "LearnGitLab|Scan dependencies for vulnerabilities"
msgstr ""
+msgid "LearnGitLab|Secure your deployment"
+msgstr ""
+
msgid "LearnGitLab|Set up CI/CD"
msgstr ""
-msgid "LearnGitLab|Set up your first project's CI/CD"
+msgid "LearnGitLab|Set up your code"
msgstr ""
-msgid "LearnGitLab|Set up your workspace"
+msgid "LearnGitLab|Set up your first project's CI/CD"
msgstr ""
msgid "LearnGitLab|Start a free trial of GitLab Ultimate"
@@ -30910,10 +30913,10 @@ msgstr ""
msgid "LearnGitLab|Try all GitLab features for 30 days, no credit card required."
msgstr ""
-msgid "LearnGitLab|Use the built-in editor, WebIDE, or upload code using your preferred method."
+msgid "LearnGitLab|Use GitLab to deploy your application, monitor its health, and keep it secure:"
msgstr ""
-msgid "LearnGitLab|Use your new GitLab workflow to deploy your application, monitor its health, and keep it secure:"
+msgid "LearnGitLab|Use the built-in editor, WebIDE, or upload code using your preferred method."
msgstr ""
msgid "LearnGitLab|You completed all tasks!"