Add latest changes from gitlab-org/gitlab@master

2 files changed, 83 insertions, 7 deletions

diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap
index 8b54a06ac7c..981e4c84323 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap
+++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap
@@ -134,9 +134,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Set up CI/CD"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Set up CI/CD
+                
+      Set up CI/CD
+    
               </a>
             </span>
              
@@ -148,9 +155,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Start a free Ultimate trial"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Start a free Ultimate trial
+                
+      Start a free Ultimate trial
+    
               </a>
             </span>
              
@@ -162,9 +176,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Add code owners"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Add code owners
+                
+      Add code owners
+    
               </a>
             </span>
              
@@ -183,9 +204,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Add merge request approval"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Add merge request approval
+                
+      Add merge request approval
+    
               </a>
             </span>
              
@@ -240,9 +268,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Create an issue"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Create an issue
+                
+      Create an issue
+    
               </a>
             </span>
              
@@ -254,9 +289,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Submit a merge request"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Submit a merge request
+                
+      Submit a merge request
+    
               </a>
             </span>
              
@@ -304,9 +346,16 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
             <span>
               <a
                 class="gl-link"
+                data-track-action="click_link"
+                data-track-label="Run a Security scan using CI/CD"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
                 href="http://example.com/"
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                Run a Security scan using CI/CD
+                
+      Run a Security scan using CI/CD
+    
               </a>
             </span>
              
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_b_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_b_spec.js.snap
index 07c7f2df09e..3161517c916 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_b_spec.js.snap
+++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_b_spec.js.snap
@@ -110,6 +110,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Invite your colleagues"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -168,6 +171,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Create or import a repository"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -218,6 +224,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Set-up CI/CD"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -268,6 +277,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Try GitLab Ultimate for free"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -323,6 +335,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Add code owners"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -378,6 +393,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Enable require merge approvals"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -444,6 +462,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Create an issue"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -494,6 +515,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Submit a merge request (MR)"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"
@@ -560,6 +584,9 @@ exports[`Learn GitLab Design B renders correctly 1`] = `
              
             <a
               class="gl-link"
+              data-track-action="click_link"
+              data-track-label="Run a Security scan using CI/CD"
+              data-track-property="Growth::Activation::Experiment::LearnGitLabB"
               href="http://example.com/"
               rel="noopener noreferrer"
               target="_blank"