Add latest changes from gitlab-org/gitlab@master

.gitlab/merge_request_templates/Security Release.md

@@ -31,7 +31,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla
 ## Maintainer checklist
 
 - [ ] Correct milestone is applied and the title is matching across all backports.
-- [ ] Assigned to `@gitlab-release-tools-bot` with passing CI pipelines.
+- [ ] Assigned (_not_ as reviewer) to `@gitlab-release-tools-bot` with passing CI pipelines.
 
 /label ~security
 

app/assets/javascripts/google_tag_manager/index.js

@@ -150,7 +150,7 @@ export const trackSaasTrialProject = () => {
   });
 };
 
-export const trackSaasTrialProjectImport = () => {
+export const trackProjectImport = () => {
   if (!isSupported()) {
     return;
   }
@@ -159,7 +159,7 @@ export const trackSaasTrialProjectImport = () => {
   importButtons.forEach((button) => {
     button.addEventListener('click', () => {
       const { platform } = button.dataset;
-      pushEvent('saasTrialProjectImport', { saasProjectImport: platform });
+      pushEvent('projectImport', { platform });
     });
   });
 };

spec/frontend/google_tag_manager/index_spec.js

@@ -3,12 +3,12 @@ import { v4 as uuidv4 } from 'uuid';
 import {
   trackCombinedGroupProjectForm,
   trackFreeTrialAccountSubmissions,
+  trackProjectImport,
   trackNewRegistrations,
   trackSaasTrialSubmit,
   trackSaasTrialSkip,
   trackSaasTrialGroup,
   trackSaasTrialProject,
-  trackSaasTrialProjectImport,
   trackSaasTrialGetStarted,
   trackCheckout,
   trackTransaction,
@@ -150,20 +150,20 @@ describe('~/google_tag_manager/index', () => {
     createTestCase(trackSaasTrialProject, {
       forms: [{ id: 'new_project', expectation: { event: 'saasTrialProject' } }],
     }),
-    createTestCase(trackSaasTrialProjectImport, {
+    createTestCase(trackProjectImport, {
       links: [
         {
           id: 'js-test-btn-0',
           cls: 'js-import-project-btn',
           attributes: { 'data-platform': 'bitbucket' },
-          expectation: { event: 'saasTrialProjectImport', saasProjectImport: 'bitbucket' },
+          expectation: { event: 'projectImport', platform: 'bitbucket' },
         },
         {
           // id is neeeded so we trigger the right element in the test
           id: 'js-test-btn-1',
           cls: 'js-import-project-btn',
           attributes: { 'data-platform': 'github' },
-          expectation: { event: 'saasTrialProjectImport', saasProjectImport: 'github' },
+          expectation: { event: 'projectImport', platform: 'github' },
         },
       ],
     }),