From 1bcebb67d554d95aa77d4cf42b22e7c96e1c8527 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 9 Mar 2022 21:07:04 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/issue_templates/Feature Flag Roll Out.md   |   3 +-
 GITALY_SERVER_VERSION                              |   2 +-
 .../components/alert_management_table.vue          |   7 +-
 app/assets/javascripts/blob_edit/blob_bundle.js    |   9 --
 .../javascripts/captcha/apollo_captcha_link.js     |   2 +-
 .../captcha/captcha_modal_axios_interceptor.js     |   4 +-
 .../code_quality_walkthrough/components/step.vue   | 150 ------------------
 .../code_quality_walkthrough/constants.js          |  67 --------
 .../javascripts/code_quality_walkthrough/index.js  |  14 --
 .../javascripts/code_quality_walkthrough/utils.js  |  39 -----
 app/assets/javascripts/jobs/components/job_app.vue |  15 --
 app/assets/javascripts/jobs/index.js               |   2 -
 .../components/pipelines_list/empty_state.vue      |  48 +-----
 .../components/pipelines_list/pipelines.vue        |   6 -
 .../pipelines_list/pipelines_status_badge.vue      |  23 ---
 .../javascripts/pipelines/pipelines_index.js       |   2 -
 .../components/states/commits_header.vue           |   2 +-
 app/controllers/groups/deploy_tokens_controller.rb |   3 +-
 app/controllers/projects/blob_controller.rb        |  17 +-
 app/controllers/projects/pipelines_controller.rb   |  17 +-
 app/helpers/ci/jobs_helper.rb                      |   3 +-
 app/helpers/ci/pipelines_helper.rb                 |   1 -
 app/presenters/project_presenter.rb                |  11 --
 app/serializers/pipeline_details_entity.rb         |   5 -
 .../groups/deploy_tokens/create_service.rb         |   2 +
 .../groups/deploy_tokens/destroy_service.rb        |   2 +
 .../groups/deploy_tokens/revoke_service.rb         |  16 ++
 .../pager_duty/process_webhook_service.rb          |   7 +-
 app/views/projects/blob/new.html.haml              |   5 +-
 app/views/projects/issues/_form.html.haml          |   2 +-
 app/views/projects/pipelines/index.html.haml       |   2 +-
 app/views/shared/issuable/_form.html.haml          |   4 +-
 app/views/shared/issuable/form/_title.html.haml    |   6 +-
 ...uality_walkthrough_commit_ci_file_dismissed.yml |  21 ---
 ...uality_walkthrough_commit_ci_file_displayed.yml |  21 ---
 ...052_code_quality_walkthrough_commit_created.yml |  21 ---
 ...205053_code_quality_walkthrough_cta_clicked.yml |  21 ---
 ...ality_walkthrough_failed_pipeline_displayed.yml |  21 ---
 ...ality_walkthrough_failed_pipeline_view_logs.yml |  21 ---
 ...lity_walkthrough_running_pipeline_dismissed.yml |  21 ---
 ...lity_walkthrough_running_pipeline_displayed.yml |  21 ---
 ...lity_walkthrough_success_pipeline_displayed.yml |  21 ---
 ...lity_walkthrough_success_pipeline_view_logs.yml |  21 ---
 .../development/new_vulnerability_form.yml         |   8 +
 .../experiment/code_quality_walkthrough.yml        |   8 -
 doc/administration/audit_events.md                 |   2 +
 locale/gitlab.pot                                  |  54 +------
 spec/controllers/projects/blob_controller_spec.rb  |  19 ---
 .../projects/pipelines_controller_spec.rb          |   4 -
 spec/features/issues/form_spec.rb                  |   8 +
 .../components/__snapshots__/step_spec.js.snap     | 174 ---------------------
 .../components/step_spec.js                        | 156 ------------------
 spec/frontend/jobs/components/job_app_spec.js      |   1 -
 spec/frontend/pipelines/pipelines_spec.js          |  36 -----
 spec/helpers/ci/pipelines_helper_spec.rb           |   1 -
 spec/presenters/project_presenter_spec.rb          |   6 -
 .../groups/deploy_tokens_controller_spec.rb        |  40 +++++
 spec/serializers/pipeline_details_entity_spec.rb   |  14 --
 .../groups/deploy_tokens/revoke_service_spec.rb    |  28 ++++
 59 files changed, 138 insertions(+), 1129 deletions(-)
 delete mode 100644 app/assets/javascripts/code_quality_walkthrough/components/step.vue
 delete mode 100644 app/assets/javascripts/code_quality_walkthrough/constants.js
 delete mode 100644 app/assets/javascripts/code_quality_walkthrough/index.js
 delete mode 100644 app/assets/javascripts/code_quality_walkthrough/utils.js
 create mode 100644 app/services/groups/deploy_tokens/revoke_service.rb
 delete mode 100644 config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml
 delete mode 100644 config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml
 delete mode 100644 config/events/20210915205052_code_quality_walkthrough_commit_created.yml
 delete mode 100644 config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml
 delete mode 100644 config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml
 delete mode 100644 config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml
 delete mode 100644 config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml
 delete mode 100644 config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml
 delete mode 100644 config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml
 delete mode 100644 config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml
 create mode 100644 config/feature_flags/development/new_vulnerability_form.yml
 delete mode 100644 config/feature_flags/experiment/code_quality_walkthrough.yml
 delete mode 100644 spec/frontend/code_quality_walkthrough/components/__snapshots__/step_spec.js.snap
 delete mode 100644 spec/frontend/code_quality_walkthrough/components/step_spec.js
 create mode 100644 spec/requests/groups/deploy_tokens_controller_spec.rb
 create mode 100644 spec/services/groups/deploy_tokens/revoke_service_spec.rb

diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md
index 590e627df75..3903e30e5ab 100644
--- a/.gitlab/issue_templates/Feature Flag Roll Out.md	
+++ b/.gitlab/issue_templates/Feature Flag Roll Out.md	
@@ -89,7 +89,8 @@ _Consider adding links to check for Sentry errors, Production logs for 5xx, 302s
 - [ ] Ensure that you or a representative in development can be available for at least 2 hours after feature flag updates in production.
   If a different developer will be covering, or an exception is needed, please inform the oncall SRE by using the `@sre-oncall` Slack alias.
 - [ ] Ensure that documentation has been updated ([More info](https://docs.gitlab.com/ee/development/documentation/feature_flags.html#features-that-became-enabled-by-default)).
-- [ ] Announce on [the feature issue](ISSUE LINK) an estimated time this will be enabled on GitLab.com.
+- [ ] Announce on [the feature issue](ISSUE LINK) an estimated time this will be enabled on GitLab.com. 
+- [ ] Ensure that any breaking changes have been announced following the [release post process](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecations-removals-and-breaking-changes) to ensure GitLab customers are aware.
 - [ ] Notify `#support_gitlab-com` and your team channel ([more guidance when this is necessary in the dev docs](https://docs.gitlab.com/ee/development/feature_flags/controls.html#communicate-the-change)).
 
 ### Global rollout on production
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 6dc73c70b82..cdf11c7f4d7 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-ebb18ecc514b369fb0958dab95ba803a20c67cd4
+f6ca4c932139d0e6b4407f2ec6251858479382f0
diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue
index 84c2b216859..929f5d10956 100644
--- a/app/assets/javascripts/alert_management/components/alert_management_table.vue
+++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue
@@ -12,8 +12,8 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import getAlertsQuery from '~/graphql_shared/queries/get_alerts.query.graphql';
+import { sortObjectToString } from '~/lib/utils/table_utility';
 import { fetchPolicies } from '~/lib/graphql';
-import { convertToSnakeCase } from '~/lib/utils/text_utility';
 import { joinPaths, visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, n__ } from '~/locale';
 import AlertStatus from '~/vue_shared/alert_details/components/alert_status.vue';
@@ -213,11 +213,8 @@ export default {
   },
   methods: {
     fetchSortedData({ sortBy, sortDesc }) {
-      const sortingDirection = sortDesc ? 'DESC' : 'ASC';
-      const sortingColumn = convertToSnakeCase(sortBy).toUpperCase();
-
       this.pagination = initialPaginationState;
-      this.sort = `${sortingColumn}_${sortingDirection}`;
+      this.sort = sortObjectToString({ sortBy, sortDesc });
     },
     navigateToAlertDetails({ iid }, index, { metaKey }) {
       return visitUrl(joinPaths(window.location.pathname, iid, 'details'), metaKey);
diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js
index 5d1c1e15d15..425de914c17 100644
--- a/app/assets/javascripts/blob_edit/blob_bundle.js
+++ b/app/assets/javascripts/blob_edit/blob_bundle.js
@@ -2,7 +2,6 @@
 
 import $ from 'jquery';
 import initPopover from '~/blob/suggest_gitlab_ci_yml';
-import initCodeQualityWalkthrough from '~/code_quality_walkthrough';
 import createFlash from '~/flash';
 import { disableButtonIfEmptyField, setCookie } from '~/lib/utils/common_utils';
 import Tracking from '~/tracking';
@@ -39,13 +38,6 @@ const initPopovers = () => {
   }
 };
 
-const initCodeQualityWalkthroughStep = () => {
-  const codeQualityWalkthroughEl = document.querySelector('.js-code-quality-walkthrough');
-  if (codeQualityWalkthroughEl) {
-    initCodeQualityWalkthrough(codeQualityWalkthroughEl);
-  }
-};
-
 export const initUploadForm = () => {
   const uploadBlobForm = $('.js-upload-blob-form');
   if (uploadBlobForm.length) {
@@ -84,7 +76,6 @@ export default () => {
           previewMarkdownPath,
         });
         initPopovers();
-        initCodeQualityWalkthroughStep();
       })
       .catch((e) =>
         createFlash({
diff --git a/app/assets/javascripts/captcha/apollo_captcha_link.js b/app/assets/javascripts/captcha/apollo_captcha_link.js
index d63ffaf5f1a..2d154139c7b 100644
--- a/app/assets/javascripts/captcha/apollo_captcha_link.js
+++ b/app/assets/javascripts/captcha/apollo_captcha_link.js
@@ -12,7 +12,7 @@ export const apolloCaptchaLink = new ApolloLink((operation, forward) =>
       const spamLogId = captchaError.extensions.spam_log_id;
 
       return new Observable((observer) => {
-        import('~/captcha/wait_for_captcha_to_be_solved')
+        import('jh_else_ce/captcha/wait_for_captcha_to_be_solved')
           .then(({ waitForCaptchaToBeSolved }) => waitForCaptchaToBeSolved(captchaSiteKey))
           .then((captchaResponse) => {
             // If the captcha was solved correctly, we re-do our action while setting
diff --git a/app/assets/javascripts/captcha/captcha_modal_axios_interceptor.js b/app/assets/javascripts/captcha/captcha_modal_axios_interceptor.js
index fdab188f6be..19fde2500f1 100644
--- a/app/assets/javascripts/captcha/captcha_modal_axios_interceptor.js
+++ b/app/assets/javascripts/captcha/captcha_modal_axios_interceptor.js
@@ -9,7 +9,9 @@ function needsCaptchaResponse(err) {
 const showCaptchaModalAndResubmit = async (axios, data, errConfig) => {
   // NOTE: We asynchronously import and unbox the module. Since this is included globally, we don't
   // do a regular import because that would increase the size of the webpack bundle.
-  const { waitForCaptchaToBeSolved } = await import('~/captcha/wait_for_captcha_to_be_solved');
+  const { waitForCaptchaToBeSolved } = await import(
+    'jh_else_ce/captcha/wait_for_captcha_to_be_solved'
+  );
 
   // show the CAPTCHA modal and wait for it to be solved or closed
   const captchaResponse = await waitForCaptchaToBeSolved(data.captcha_site_key);
diff --git a/app/assets/javascripts/code_quality_walkthrough/components/step.vue b/app/assets/javascripts/code_quality_walkthrough/components/step.vue
deleted file mode 100644
index 1a23c96b7d6..00000000000
--- a/app/assets/javascripts/code_quality_walkthrough/components/step.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<script>
-import { GlPopover, GlSprintf, GlButton, GlAlert } from '@gitlab/ui';
-import { STEPS, STEPSTATES } from '../constants';
-import {
-  isWalkthroughEnabled,
-  getExperimentSettings,
-  setExperimentSettings,
-  track,
-} from '../utils';
-
-export default {
-  target: '#js-code-quality-walkthrough',
-  components: {
-    GlPopover,
-    GlSprintf,
-    GlButton,
-    GlAlert,
-  },
-  props: {
-    step: {
-      type: String,
-      required: true,
-    },
-    link: {
-      type: String,
-      required: false,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      dismissedSettings: getExperimentSettings(),
-      currentStep: STEPSTATES[this.step],
-    };
-  },
-  computed: {
-    isPopoverVisible() {
-      return (
-        [
-          STEPS.commitCiFile,
-          STEPS.runningPipeline,
-          STEPS.successPipeline,
-          STEPS.failedPipeline,
-        ].includes(this.step) &&
-        isWalkthroughEnabled() &&
-        !this.isDismissed
-      );
-    },
-    isAlertVisible() {
-      return this.step === STEPS.troubleshootJob && isWalkthroughEnabled() && !this.isDismissed;
-    },
-    isDismissed() {
-      return this.dismissedSettings[this.step];
-    },
-    title() {
-      return this.currentStep?.title || '';
-    },
-    body() {
-      return this.currentStep?.body || '';
-    },
-    buttonText() {
-      return this.currentStep?.buttonText || '';
-    },
-    buttonLink() {
-      return [STEPS.successPipeline, STEPS.failedPipeline].includes(this.step) ? this.link : '';
-    },
-    placement() {
-      return this.currentStep?.placement || 'bottom';
-    },
-    offset() {
-      return this.currentStep?.offset || 0;
-    },
-  },
-  created() {
-    this.trackDisplayed();
-  },
-  updated() {
-    this.trackDisplayed();
-  },
-  methods: {
-    onDismiss() {
-      this.$set(this.dismissedSettings, this.step, true);
-      setExperimentSettings(this.dismissedSettings);
-      const action = [STEPS.successPipeline, STEPS.failedPipeline].includes(this.step)
-        ? 'view_logs'
-        : 'dismissed';
-      this.trackAction(action);
-    },
-    trackDisplayed() {
-      if (this.isPopoverVisible || this.isAlertVisible) {
-        this.trackAction('displayed');
-      }
-    },
-    trackAction(action) {
-      track(`${this.step}_${action}`);
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <gl-popover
-      v-if="isPopoverVisible"
-      :key="step"
-      :target="$options.target"
-      :placement="placement"
-      :offset="offset"
-      show
-      triggers="manual"
-      container="viewport"
-    >
-      <template #title>
-        <gl-sprintf :message="title">
-          <template #emoji="{ content }">
-            <gl-emoji class="gl-mr-2" :data-name="content"
-          /></template>
-        </gl-sprintf>
-      </template>
-      <gl-sprintf :message="body">
-        <template #strong="{ content }">
-          <strong>{{ content }}</strong>
-        </template>
-        <template #lineBreak>
-          <div class="gl-mt-5"></div>
-        </template>
-        <template #emoji="{ content }">
-          <gl-emoji :data-name="content" />
-        </template>
-      </gl-sprintf>
-      <div class="gl-mt-2 gl-text-right">
-        <gl-button category="tertiary" variant="link" :href="buttonLink" @click="onDismiss">
-          {{ buttonText }}
-        </gl-button>
-      </div>
-    </gl-popover>
-    <gl-alert
-      v-if="isAlertVisible"
-      variant="tip"
-      :title="title"
-      :primary-button-text="buttonText"
-      :primary-button-link="link"
-      class="gl-my-5"
-      @primaryAction="trackAction('clicked')"
-      @dismiss="onDismiss"
-    >
-      {{ body }}
-    </gl-alert>
-  </div>
-</template>
diff --git a/app/assets/javascripts/code_quality_walkthrough/constants.js b/app/assets/javascripts/code_quality_walkthrough/constants.js
deleted file mode 100644
index 011df06b5cc..00000000000
--- a/app/assets/javascripts/code_quality_walkthrough/constants.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { s__ } from '~/locale';
-
-export const EXPERIMENT_NAME = 'code_quality_walkthrough';
-
-export const STEPS = {
-  commitCiFile: 'commit_ci_file',
-  runningPipeline: 'running_pipeline',
-  successPipeline: 'success_pipeline',
-  failedPipeline: 'failed_pipeline',
-  troubleshootJob: 'troubleshoot_job',
-};
-
-export const STEPSTATES = {
-  [STEPS.commitCiFile]: {
-    title: s__("codeQualityWalkthrough|Let's start by creating a new CI file."),
-    body: s__(
-      'codeQualityWalkthrough|To begin with code quality, we first need to create a new CI file using our code editor. We added a code quality template in the code editor to help you get started %{emojiStart}wink%{emojiEnd} .%{lineBreak}Take some time to review the template, when you are ready, use the %{strongStart}commit changes%{strongEnd} button at the bottom of the page.',
-    ),
-    buttonText: s__('codeQualityWalkthrough|Got it'),
-    placement: 'right',
-    offset: 90,
-  },
-  [STEPS.runningPipeline]: {
-    title: s__(
-      'codeQualityWalkthrough|Congrats! Your first pipeline is running %{emojiStart}zap%{emojiEnd}',
-    ),
-    body: s__(
-      "codeQualityWalkthrough|Your pipeline can take a few minutes to run. If you enabled email notifications, you'll receive an email with your pipeline status. In the meantime, why don't you get some coffee? You earned it!",
-    ),
-    buttonText: s__('codeQualityWalkthrough|Got it'),
-    offset: 97,
-  },
-  [STEPS.successPipeline]: {
-    title: s__(
-      "codeQualityWalkthrough|Well done! You've just automated your code quality review. %{emojiStart}raised_hands%{emojiEnd}",
-    ),
-    body: s__(
-      'codeQualityWalkthrough|A code quality job will now run every time you or your team members commit changes to your project. You can view the results of the code quality job in the job logs.',
-    ),
-    buttonText: s__('codeQualityWalkthrough|View the logs'),
-    offset: 98,
-  },
-  [STEPS.failedPipeline]: {
-    title: s__(
-      "codeQualityWalkthrough|Something went wrong. %{emojiStart}thinking%{emojiEnd} Let's fix it.",
-    ),
-    body: s__(
-      "codeQualityWalkthrough|Your job failed. No worries - this happens. Let's view the logs, and see how we can fix it.",
-    ),
-    buttonText: s__('codeQualityWalkthrough|View the logs'),
-    offset: 98,
-  },
-  [STEPS.troubleshootJob]: {
-    title: s__('codeQualityWalkthrough|Troubleshoot your code quality job'),
-    body: s__(
-      'codeQualityWalkthrough|Not sure how to fix your failed job? We have compiled some tips on how to troubleshoot code quality jobs in the documentation.',
-    ),
-    buttonText: s__('codeQualityWalkthrough|Read the documentation'),
-  },
-};
-
-export const PIPELINE_STATUSES = {
-  running: 'running',
-  successWithWarnings: 'success-with-warnings',
-  success: 'success',
-  failed: 'failed',
-};
diff --git a/app/assets/javascripts/code_quality_walkthrough/index.js b/app/assets/javascripts/code_quality_walkthrough/index.js
deleted file mode 100644
index b0592b8a84b..00000000000
--- a/app/assets/javascripts/code_quality_walkthrough/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Vue from 'vue';
-import Step from './components/step.vue';
-
-export default (el) =>
-  new Vue({
-    el,
-    render(createElement) {
-      return createElement(Step, {
-        props: {
-          step: el.dataset.step,
-        },
-      });
-    },
-  });
diff --git a/app/assets/javascripts/code_quality_walkthrough/utils.js b/app/assets/javascripts/code_quality_walkthrough/utils.js
deleted file mode 100644
index 894ec9a171d..00000000000
--- a/app/assets/javascripts/code_quality_walkthrough/utils.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { TRACKING_CONTEXT_SCHEMA } from '~/experimentation/constants';
-import { getExperimentData } from '~/experimentation/utils';
-import { setCookie, getCookie } from '~/lib/utils/common_utils';
-import { getParameterByName } from '~/lib/utils/url_utility';
-import Tracking from '~/tracking';
-import { EXPERIMENT_NAME } from './constants';
-
-export function getExperimentSettings() {
-  return JSON.parse(getCookie(EXPERIMENT_NAME) || '{}');
-}
-
-export function setExperimentSettings(settings) {
-  setCookie(EXPERIMENT_NAME, settings);
-}
-
-export function isWalkthroughEnabled() {
-  return getParameterByName(EXPERIMENT_NAME);
-}
-
-export function track(action) {
-  const { data } = getExperimentSettings();
-
-  if (data) {
-    Tracking.event(EXPERIMENT_NAME, action, {
-      context: {
-        schema: TRACKING_CONTEXT_SCHEMA,
-        data,
-      },
-    });
-  }
-}
-
-export function startCodeQualityWalkthrough() {
-  const data = getExperimentData(EXPERIMENT_NAME);
-
-  if (data) {
-    setExperimentSettings({ data });
-  }
-}
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index 605172155dc..85fe5ed7e26 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -3,7 +3,6 @@ import { GlLoadingIcon, GlIcon, GlSafeHtmlDirective as SafeHtml, GlAlert } from
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import { throttle, isEmpty } from 'lodash';
 import { mapGetters, mapState, mapActions } from 'vuex';
-import CodeQualityWalkthrough from '~/code_quality_walkthrough/components/step.vue';
 import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
 import { __, sprintf } from '~/locale';
 import CiHeader from '~/vue_shared/components/header_ci_component.vue';
@@ -33,7 +32,6 @@ export default {
     GlLoadingIcon,
     SharedRunner: () => import('ee_component/jobs/components/shared_runner_limit_block.vue'),
     GlAlert,
-    CodeQualityWalkthrough,
   },
   directives: {
     SafeHtml,
@@ -69,11 +67,6 @@ export default {
       required: false,
       default: null,
     },
-    codeQualityHelpUrl: {
-      type: String,
-      required: false,
-      default: null,
-    },
   },
   computed: {
     ...mapState([
@@ -123,9 +116,6 @@ export default {
       return this.shouldRenderCalloutMessage && !this.hasUnmetPrerequisitesFailure;
     },
 
-    shouldRenderCodeQualityWalkthrough() {
-      return this.job.status.group === 'failed-with-warnings';
-    },
     itemName() {
       return sprintf(__('Job %{jobName}'), { jobName: this.job.name });
     },
@@ -224,11 +214,6 @@ export default {
           >
             <div v-safe-html="job.callout_message"></div>
           </gl-alert>
-          <code-quality-walkthrough
-            v-if="shouldRenderCodeQualityWalkthrough"
-            step="troubleshoot_job"
-            :link="codeQualityHelpUrl"
-          />
         </header>
         <!-- EO Header Section -->
 
diff --git a/app/assets/javascripts/jobs/index.js b/app/assets/javascripts/jobs/index.js
index 6e958ea1842..26dd38bbe08 100644
--- a/app/assets/javascripts/jobs/index.js
+++ b/app/assets/javascripts/jobs/index.js
@@ -14,7 +14,6 @@ const initializeJobPage = (element) => {
   const {
     artifactHelpUrl,
     deploymentHelpUrl,
-    codeQualityHelpUrl,
     runnerSettingsUrl,
     subscriptionsMoreMinutesUrl,
     endpoint,
@@ -39,7 +38,6 @@ const initializeJobPage = (element) => {
         props: {
           artifactHelpUrl,
           deploymentHelpUrl,
-          codeQualityHelpUrl,
           runnerSettingsUrl,
           subscriptionsMoreMinutesUrl,
           endpoint,
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue
index bc433db3eb8..0380ba646cc 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue
@@ -1,25 +1,15 @@
 <script>
-import { GlEmptyState, GlButton } from '@gitlab/ui';
-import { startCodeQualityWalkthrough, track } from '~/code_quality_walkthrough/utils';
-import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
-import { getExperimentData } from '~/experimentation/utils';
+import { GlEmptyState } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import PipelinesCiTemplates from './pipelines_ci_templates.vue';
 
 export default {
   i18n: {
-    codeQualityTitle: s__('Pipelines|Improve code quality with GitLab CI/CD'),
-    codeQualityDescription: s__(`Pipelines|To keep your codebase simple,
-      readable, and accessible to contributors, use GitLab CI/CD
-      to analyze your code quality with every push to your project.`),
-    codeQualityBtnText: s__('Pipelines|Add a code quality job'),
     noCiDescription: s__('Pipelines|This project is not currently set up to run pipelines.'),
   },
   name: 'PipelinesEmptyState',
   components: {
     GlEmptyState,
-    GlButton,
-    GitlabExperiment,
     PipelinesCiTemplates,
   },
   props: {
@@ -31,11 +21,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    codeQualityPagePath: {
-      type: String,
-      required: false,
-      default: null,
-    },
     ciRunnerSettingsPath: {
       type: String,
       required: false,
@@ -47,41 +32,12 @@ export default {
       default: true,
     },
   },
-  computed: {
-    isCodeQualityExperimentActive() {
-      return this.canSetCi && Boolean(getExperimentData('code_quality_walkthrough'));
-    },
-  },
-  mounted() {
-    startCodeQualityWalkthrough();
-  },
-  methods: {
-    trackClick() {
-      track('cta_clicked');
-    },
-  },
 };
 </script>
 <template>
   <div>
-    <gitlab-experiment v-if="isCodeQualityExperimentActive" name="code_quality_walkthrough">
-      <template #control><pipelines-ci-templates /></template>
-      <template #candidate>
-        <gl-empty-state
-          :title="$options.i18n.codeQualityTitle"
-          :svg-path="emptyStateSvgPath"
-          :description="$options.i18n.codeQualityDescription"
-        >
-          <template #actions>
-            <gl-button :href="codeQualityPagePath" variant="confirm" @click="trackClick()">
-              {{ $options.i18n.codeQualityBtnText }}
-            </gl-button>
-          </template>
-        </gl-empty-state>
-      </template>
-    </gitlab-experiment>
     <pipelines-ci-templates
-      v-else-if="canSetCi"
+      v-if="canSetCi"
       :ci-runner-settings-path="ciRunnerSettingsPath"
       :any-runners-available="anyRunnersAvailable"
     />
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
index 8c2bed0ce71..5a94d144031 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
@@ -102,11 +102,6 @@ export default {
       type: Object,
       required: true,
     },
-    codeQualityPagePath: {
-      type: String,
-      required: false,
-      default: null,
-    },
     ciRunnerSettingsPath: {
       type: String,
       required: false,
@@ -385,7 +380,6 @@ export default {
         v-else-if="stateToRender === $options.stateMap.emptyState"
         :empty-state-svg-path="emptyStateSvgPath"
         :can-set-ci="canCreatePipeline"
-        :code-quality-page-path="codeQualityPagePath"
         :ci-runner-settings-path="ciRunnerSettingsPath"
         :any-runners-available="anyRunnersAvailable"
       />
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
index b7c613ea690..e765a8cd86c 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
@@ -1,13 +1,10 @@
 <script>
-import CodeQualityWalkthrough from '~/code_quality_walkthrough/components/step.vue';
-import { PIPELINE_STATUSES } from '~/code_quality_walkthrough/constants';
 import { CHILD_VIEW } from '~/pipelines/constants';
 import CiBadge from '~/vue_shared/components/ci_badge_link.vue';
 import PipelinesTimeago from './time_ago.vue';
 
 export default {
   components: {
-    CodeQualityWalkthrough,
     CiBadge,
     PipelinesTimeago,
   },
@@ -28,20 +25,6 @@ export default {
     isChildView() {
       return this.viewType === CHILD_VIEW;
     },
-    shouldRenderCodeQualityWalkthrough() {
-      return Object.values(PIPELINE_STATUSES).includes(this.pipelineStatus.group);
-    },
-    codeQualityStep() {
-      const prefix = [PIPELINE_STATUSES.successWithWarnings, PIPELINE_STATUSES.failed].includes(
-        this.pipelineStatus.group,
-      )
-        ? 'failed'
-        : this.pipelineStatus.group;
-      return `${prefix}_pipeline`;
-    },
-    codeQualityBuildPath() {
-      return this.pipeline?.details?.code_quality_build_path;
-    },
   },
 };
 </script>
@@ -49,7 +32,6 @@ export default {
 <template>
   <div>
     <ci-badge
-      id="js-code-quality-walkthrough"
       class="gl-mb-3"
       :status="pipelineStatus"
       :show-text="!isChildView"
@@ -57,10 +39,5 @@ export default {
       data-qa-selector="pipeline_commit_status"
     />
     <pipelines-timeago class="gl-mt-3" :pipeline="pipeline" />
-    <code-quality-walkthrough
-      v-if="shouldRenderCodeQualityWalkthrough"
-      :step="codeQualityStep"
-      :link="codeQualityBuildPath"
-    />
   </div>
 </template>
diff --git a/app/assets/javascripts/pipelines/pipelines_index.js b/app/assets/javascripts/pipelines/pipelines_index.js
index 80af3f53245..2b1f5419953 100644
--- a/app/assets/javascripts/pipelines/pipelines_index.js
+++ b/app/assets/javascripts/pipelines/pipelines_index.js
@@ -37,7 +37,6 @@ export const initPipelinesIndex = (selector = '#pipelines-list-vue') => {
     resetCachePath,
     projectId,
     params,
-    codeQualityPagePath,
     ciRunnerSettingsPath,
     anyRunnersAvailable,
   } = el.dataset;
@@ -77,7 +76,6 @@ export const initPipelinesIndex = (selector = '#pipelines-list-vue') => {
           resetCachePath,
           projectId,
           params: JSON.parse(params),
-          codeQualityPagePath,
           ciRunnerSettingsPath,
           anyRunnersAvailable: parseBoolean(anyRunnersAvailable),
         },
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
index 5c4a526bcc3..400759aa086 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
@@ -77,7 +77,7 @@ export default {
             :target-branch="targetBranch"
           />
         </span>
-        <gl-button variant="link" class="modify-message-button">
+        <gl-button category="tertiary" variant="confirm" size="small" class="modify-message-button">
           {{ modifyLinkMessage }}
         </gl-button>
       </span>
diff --git a/app/controllers/groups/deploy_tokens_controller.rb b/app/controllers/groups/deploy_tokens_controller.rb
index 79152bf2695..9ef22aa33dc 100644
--- a/app/controllers/groups/deploy_tokens_controller.rb
+++ b/app/controllers/groups/deploy_tokens_controller.rb
@@ -6,8 +6,7 @@ class Groups::DeployTokensController < Groups::ApplicationController
   feature_category :continuous_delivery
 
   def revoke
-    @token = @group.deploy_tokens.find(params[:id])
-    @token.revoke!
+    Groups::DeployTokens::RevokeService.new(@group, current_user, params).execute
 
     redirect_to group_settings_repository_path(@group, anchor: 'js-deploy-tokens')
   end
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index c24b907bb49..26a7b5662be 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -35,7 +35,6 @@ class Projects::BlobController < Projects::ApplicationController
   before_action :editor_variables, except: [:show, :preview, :diff]
   before_action :validate_diff_params, only: :diff
   before_action :set_last_commit_sha, only: [:edit, :update]
-  before_action :track_experiment, only: :create
 
   track_redis_hll_event :create, :update, name: 'g_edit_by_sfe'
 
@@ -54,7 +53,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def create
     create_commit(Files::CreateService, success_notice: _("The file has been successfully created."),
-                                        success_path: -> { create_success_path },
+                                        success_path: -> { project_blob_path(@project, File.join(@branch_name, @file_path)) },
                                         failure_view: :new,
                                         failure_path: project_new_blob_path(@project, @ref))
   end
@@ -282,20 +281,6 @@ class Projects::BlobController < Projects::ApplicationController
   def visitor_id
     current_user&.id
   end
-
-  def create_success_path
-    if params[:code_quality_walkthrough]
-      project_pipelines_path(@project, code_quality_walkthrough: true)
-    else
-      project_blob_path(@project, File.join(@branch_name, @file_path))
-    end
-  end
-
-  def track_experiment
-    return unless params[:code_quality_walkthrough]
-
-    experiment(:code_quality_walkthrough, namespace: @project.root_ancestor).track(:commit_created)
-  end
 end
 
 Projects::BlobController.prepend_mod
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 310b8d1d477..b6a9f01c9c8 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -51,7 +51,6 @@ class Projects::PipelinesController < Projects::ApplicationController
 
     respond_to do |format|
       format.html do
-        enable_code_quality_walkthrough_experiment
         enable_runners_availability_section_experiment
       end
       format.json do
@@ -220,7 +219,7 @@ class Projects::PipelinesController < Projects::ApplicationController
     PipelineSerializer
       .new(project: @project, current_user: @current_user)
       .with_pagination(request, response)
-      .represent(@pipelines, disable_coverage: true, preload: true, code_quality_walkthrough: params[:code_quality_walkthrough].present?)
+      .represent(@pipelines, disable_coverage: true, preload: true)
   end
 
   def render_show
@@ -305,20 +304,6 @@ class Projects::PipelinesController < Projects::ApplicationController
     params.permit(:scope, :username, :ref, :status, :source)
   end
 
-  def enable_code_quality_walkthrough_experiment
-    experiment(:code_quality_walkthrough, namespace: project.root_ancestor) do |e|
-      e.exclude! unless current_user
-      e.exclude! unless can?(current_user, :create_pipeline, project)
-      e.exclude! unless project.root_ancestor.recent?
-      e.exclude! if @pipelines_count.to_i > 0
-      e.exclude! if helpers.has_gitlab_ci?(project)
-
-      e.control {}
-      e.candidate {}
-      e.publish_to_database
-    end
-  end
-
   def enable_runners_availability_section_experiment
     return unless current_user
     return unless can?(current_user, :create_pipeline, project)
diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
index c0dca66bac8..14e52b120f3 100644
--- a/app/helpers/ci/jobs_helper.rb
+++ b/app/helpers/ci/jobs_helper.rb
@@ -14,8 +14,7 @@ module Ci
         "build_stage" => @build.stage,
         "log_state" => '',
         "build_options" => javascript_build_options,
-        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings', anchor: 'retry-outdated-jobs'),
-        "code_quality_help_url" => help_page_path('user/project/merge_requests/code_quality', anchor: 'troubleshooting')
+        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings', anchor: 'retry-outdated-jobs')
       }
     end
 
diff --git a/app/helpers/ci/pipelines_helper.rb b/app/helpers/ci/pipelines_helper.rb
index 0ed43c512ef..d742842b8b6 100644
--- a/app/helpers/ci/pipelines_helper.rb
+++ b/app/helpers/ci/pipelines_helper.rb
@@ -98,7 +98,6 @@ module Ci
         has_gitlab_ci: has_gitlab_ci?(project).to_s,
         pipeline_editor_path: can?(current_user, :create_pipeline, project) && project_ci_pipeline_editor_path(project),
         suggested_ci_templates: suggested_ci_templates.to_json,
-        code_quality_page_path: project.present(current_user: current_user).add_code_quality_ci_yml_path,
         ci_runner_settings_path: project_settings_ci_cd_path(project, ci_runner_templates: true, anchor: 'js-runners-settings')
       }
 
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 89f0accdc5b..098519cdffe 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -137,17 +137,6 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     ide_edit_path(project, default_branch_or_main, 'README.md')
   end
 
-  def add_code_quality_ci_yml_path
-    add_special_file_path(
-      file_name: ci_config_path_or_default,
-      commit_message: s_("CommitMessage|Add %{file_name} and create a code quality job") % { file_name: ci_config_path_or_default },
-      additional_params: {
-        template: 'Code-Quality',
-        code_quality_walkthrough: true
-      }
-    )
-  end
-
   def license_short_name
     license = repository.license
     license&.nickname || license&.name || 'LICENSE'
diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb
index f459e700c03..76797a773b5 100644
--- a/app/serializers/pipeline_details_entity.rb
+++ b/app/serializers/pipeline_details_entity.rb
@@ -10,11 +10,6 @@ class PipelineDetailsEntity < Ci::PipelineEntity
   expose :details do
     expose :manual_actions, using: BuildActionEntity
     expose :scheduled_actions, using: BuildActionEntity
-    expose :code_quality_build_path, if: -> (_, options) { options[:code_quality_walkthrough] } do |pipeline|
-      next unless code_quality_build = pipeline.builds.finished.find_by_name('code_quality')
-
-      project_job_path(pipeline.project, code_quality_build, code_quality_walkthrough: true)
-    end
   end
 
   expose :triggered_by_pipeline, as: :triggered_by, with: TriggeredPipelineEntity
diff --git a/app/services/groups/deploy_tokens/create_service.rb b/app/services/groups/deploy_tokens/create_service.rb
index aee423659ef..4b0541e78a1 100644
--- a/app/services/groups/deploy_tokens/create_service.rb
+++ b/app/services/groups/deploy_tokens/create_service.rb
@@ -13,3 +13,5 @@ module Groups
     end
   end
 end
+
+Groups::DeployTokens::CreateService.prepend_mod
diff --git a/app/services/groups/deploy_tokens/destroy_service.rb b/app/services/groups/deploy_tokens/destroy_service.rb
index 6dae22f29d2..4745d00ed7f 100644
--- a/app/services/groups/deploy_tokens/destroy_service.rb
+++ b/app/services/groups/deploy_tokens/destroy_service.rb
@@ -11,3 +11,5 @@ module Groups
     end
   end
 end
+
+Groups::DeployTokens::DestroyService.prepend_mod
diff --git a/app/services/groups/deploy_tokens/revoke_service.rb b/app/services/groups/deploy_tokens/revoke_service.rb
new file mode 100644
index 00000000000..cf91d3b27fa
--- /dev/null
+++ b/app/services/groups/deploy_tokens/revoke_service.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Groups
+  module DeployTokens
+    class RevokeService < BaseService
+      attr_accessor :token
+
+      def execute
+        @token = group.deploy_tokens.find(params[:id])
+        @token.revoke!
+      end
+    end
+  end
+end
+
+Groups::DeployTokens::RevokeService.prepend_mod
diff --git a/app/services/incident_management/pager_duty/process_webhook_service.rb b/app/services/incident_management/pager_duty/process_webhook_service.rb
index ccbca671b37..a49e639ea62 100644
--- a/app/services/incident_management/pager_duty/process_webhook_service.rb
+++ b/app/services/incident_management/pager_duty/process_webhook_service.rb
@@ -2,7 +2,7 @@
 
 module IncidentManagement
   module PagerDuty
-    class ProcessWebhookService
+    class ProcessWebhookService < ::BaseProjectService
       include Gitlab::Utils::StrongMemoize
       include IncidentManagement::Settings
 
@@ -13,7 +13,8 @@ module IncidentManagement
       PAGER_DUTY_PROCESSABLE_EVENT_TYPES = %w(incident.trigger).freeze
 
       def initialize(project, payload)
-        @project = project
+        super(project: project)
+
         @payload = payload
       end
 
@@ -29,7 +30,7 @@ module IncidentManagement
 
       private
 
-      attr_reader :project, :payload
+      attr_reader :payload
 
       def process_incidents
         pager_duty_processable_events.each do |event|
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 2aeffa88c8f..60877db581f 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,16 +1,13 @@
 - breadcrumb_title _("Repository")
 - page_title _("New File"), @path.presence, @ref
 
-%h3.page-title.blob-new-page-title#js-code-quality-walkthrough
+%h3.page-title.blob-new-page-title
   = _('New file')
-  .js-code-quality-walkthrough{ data: { step: 'commit_ci_file' } }
 .file-editor
   = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths(@project)) do
     = render 'projects/blob/editor', ref: @ref
     = render 'shared/new_commit_form', placeholder: "Add new file"
 
-    - if params[:code_quality_walkthrough]
-      = hidden_field_tag 'code_quality_walkthrough', 'true'
     = hidden_field_tag 'content', '', id: 'file-content'
     = render 'projects/commit_button', ref: @ref,
       cancel_path: project_tree_path(@project, @id)
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index d85c448b29a..34e46807fb6 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,3 +1,3 @@
 = form_for [@project, @issue],
-           html: { class: 'issue-form common-note-form gl-mt-3 js-quick-submit js-requires-input' } do |f|
+  html: { class: 'issue-form common-note-form gl-mt-3 js-quick-submit gl-show-field-errors' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @issue
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 2b2c06bd92c..f4b242ffc40 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -4,7 +4,7 @@
 
 = render_if_exists "shared/shared_runners_minutes_limit_flash_message"
 
-- list_url = project_pipelines_path(@project, format: :json, code_quality_walkthrough: params[:code_quality_walkthrough])
+- list_url = project_pipelines_path(@project, format: :json)
 - add_page_startup_api_call list_url
 
 #pipelines-list-vue{ data: pipelines_list_data(@project, list_url) }
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 446d04d96b8..3f6e7a6fb32 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -19,7 +19,9 @@
 = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
 
 .form-group.row
-  = form.label :title, class: 'col-form-label col-sm-2'
+  = form.label :title, class: 'col-form-label col-sm-2' do
+    = _('Title')
+    %i{ aria: { hidden: true } }= '*'
 
   = render 'shared/issuable/form/title', issuable: issuable, form: form, has_wip_commits: commits && commits.detect(&:work_in_progress?)
 #js-suggestions{ data: { project_path: @project.full_path } }
diff --git a/app/views/shared/issuable/form/_title.html.haml b/app/views/shared/issuable/form/_title.html.haml
index 257ad7a8518..6b00cdc5e24 100644
--- a/app/views/shared/issuable/form/_title.html.haml
+++ b/app/views/shared/issuable/form/_title.html.haml
@@ -8,9 +8,9 @@
 - add_wip_text = (_('%{link_start}Start the title with %{draft_snippet}%{link_end} to prevent a merge request draft from merging before it\'s ready.') % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_snippet: '<code>Draft:</code>'.html_safe } ).html_safe
 - remove_wip_text = (_('%{link_start}Remove the %{draft_snippet} prefix%{link_end} from the title to allow this merge request to be merged when it\'s ready.' ) % { link_start: toggle_wip_link_start, link_end: toggle_wip_link_end, draft_snippet: '<code>Draft</code>'.html_safe } ).html_safe
 
-%div{ class: div_class }
-  = form.text_field :title, required: true, maxlength: 255, autofocus: true,
-      autocomplete: 'off', class: 'form-control pad qa-issuable-form-title', placeholder: _('Title'), dir: 'auto'
+%div{ class: div_class, data: { testid: 'issue-title-input-field' } }
+  = form.text_field :title, required: true, aria: { required: true }, maxlength: 255, autofocus: true,
+    autocomplete: 'off', class: 'form-control pad qa-issuable-form-title', placeholder: _('Title'), dir: 'auto'
 
   - if issuable.respond_to?(:work_in_progress?)
     .form-text.text-muted
diff --git a/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml b/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml
deleted file mode 100644
index 7ce1a3d9b76..00000000000
--- a/config/events/20210915205050_code_quality_walkthrough_commit_ci_file_dismissed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit CI file dismissed"
-category: "`code_quality_walkthrough`"
-action: commit_ci_file_dismissed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml b/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml
deleted file mode 100644
index 4fbece2fef8..00000000000
--- a/config/events/20210915205051_code_quality_walkthrough_commit_ci_file_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit CI file displayed"
-category: "`code_quality_walkthrough`"
-action: commit_ci_file_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205052_code_quality_walkthrough_commit_created.yml b/config/events/20210915205052_code_quality_walkthrough_commit_created.yml
deleted file mode 100644
index 5e8d8a1250a..00000000000
--- a/config/events/20210915205052_code_quality_walkthrough_commit_created.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Commit created"
-category: "`code_quality_walkthrough`"
-action: commit_created
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml b/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml
deleted file mode 100644
index 684bb681045..00000000000
--- a/config/events/20210915205053_code_quality_walkthrough_cta_clicked.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Click empty state CTA"
-category: "`code_quality_walkthrough`"
-action: cta_clicked
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml b/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml
deleted file mode 100644
index 517da8eac13..00000000000
--- a/config/events/20210915205054_code_quality_walkthrough_failed_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show failed pipeline"
-category: "`code_quality_walkthrough`"
-action: failed_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml b/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml
deleted file mode 100644
index adb4400f288..00000000000
--- a/config/events/20210915205055_code_quality_walkthrough_failed_pipeline_view_logs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show failed pipeline logs"
-category: "`code_quality_walkthrough`"
-action: failed_pipeline_view_logs
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml b/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml
deleted file mode 100644
index 7fcff9644f4..00000000000
--- a/config/events/20210915205056_code_quality_walkthrough_running_pipeline_dismissed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Dismiss running pipeline"
-category: "`code_quality_walkthrough`"
-action: running_pipeline_dismissed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml b/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml
deleted file mode 100644
index b7faa132d8b..00000000000
--- a/config/events/20210915205057_code_quality_walkthrough_running_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show running pipeline"
-category: "`code_quality_walkthrough`"
-action: running_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml b/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml
deleted file mode 100644
index d5909cdab89..00000000000
--- a/config/events/20210915205058_code_quality_walkthrough_success_pipeline_displayed.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show succeeded pipeline"
-category: "`code_quality_walkthrough`"
-action: success_pipeline_displayed
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml b/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml
deleted file mode 100644
index 253bf3c3577..00000000000
--- a/config/events/20210915205059_code_quality_walkthrough_success_pipeline_view_logs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-description: "Show succeeded pipeline logs"
-category: "`code_quality_walkthrough`"
-action: success_pipeline_view_logs
-label_description: ""
-property_description: ""
-value_description: ""
-extra_properties:
-identifiers:
-product_section: growth
-product_stage: growth
-product_group: group::activation
-product_category:
-milestone: "13.12"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
diff --git a/config/feature_flags/development/new_vulnerability_form.yml b/config/feature_flags/development/new_vulnerability_form.yml
new file mode 100644
index 00000000000..ee812484928
--- /dev/null
+++ b/config/feature_flags/development/new_vulnerability_form.yml
@@ -0,0 +1,8 @@
+---
+name: new_vulnerability_form
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.9'
+type: development
+group: group::threat insights
+default_enabled: false
diff --git a/config/feature_flags/experiment/code_quality_walkthrough.yml b/config/feature_flags/experiment/code_quality_walkthrough.yml
deleted file mode 100644
index 572a0dc0a9f..00000000000
--- a/config/feature_flags/experiment/code_quality_walkthrough.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: code_quality_walkthrough
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327229
-milestone: "13.12"
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index 731772f3270..de2cd9c1f77 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -109,6 +109,8 @@ From there, you can see the following actions:
 - Compliance framework created, updated, or deleted. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/340649) in GitLab 14.5.
 - Event streaming destination created, updated, or deleted. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344664) in GitLab 14.6.
 - Instance administrator started or stopped impersonation of a group member. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300961) in GitLab 14.8.
+- Group deploy token was successfully created, revoked, or deleted. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452) in GitLab 14.9.
+- Failed attempt to create a group deploy token. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452) in GitLab 14.9.
 
 Group events can also be accessed via the [Group Audit Events API](../api/audit_events.md#group-audit-events)
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index dd0310fd630..1b40c3d4baa 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8891,9 +8891,6 @@ msgstr ""
 msgid "CommitMessage|Add %{file_name}"
 msgstr ""
 
-msgid "CommitMessage|Add %{file_name} and create a code quality job"
-msgstr ""
-
 msgid "CommitWidget|authored"
 msgstr ""
 
@@ -26927,9 +26924,6 @@ msgstr ""
 msgid "Pipelines|API"
 msgstr ""
 
-msgid "Pipelines|Add a code quality job"
-msgstr ""
-
 msgid "Pipelines|Are you sure you want to run this pipeline?"
 msgstr ""
 
@@ -26990,9 +26984,6 @@ msgstr ""
 msgid "Pipelines|If you are unsure, please ask a project maintainer to review it for you."
 msgstr ""
 
-msgid "Pipelines|Improve code quality with GitLab CI/CD"
-msgstr ""
-
 msgid "Pipelines|Install GitLab Runner"
 msgstr ""
 
@@ -27098,9 +27089,6 @@ msgstr ""
 msgid "Pipelines|This project is not currently set up to run pipelines."
 msgstr ""
 
-msgid "Pipelines|To keep your codebase simple, readable, and accessible to contributors, use GitLab CI/CD to analyze your code quality with every push to your project."
-msgstr ""
-
 msgid "Pipelines|Token"
 msgstr ""
 
@@ -33025,6 +33013,9 @@ msgstr ""
 msgid "SecurityReports|Status"
 msgstr ""
 
+msgid "SecurityReports|Submit vulnerability"
+msgstr ""
+
 msgid "SecurityReports|Take survey"
 msgstr ""
 
@@ -43326,45 +43317,6 @@ msgstr ""
 msgid "closed issue"
 msgstr ""
 
-msgid "codeQualityWalkthrough|A code quality job will now run every time you or your team members commit changes to your project. You can view the results of the code quality job in the job logs."
-msgstr ""
-
-msgid "codeQualityWalkthrough|Congrats! Your first pipeline is running %{emojiStart}zap%{emojiEnd}"
-msgstr ""
-
-msgid "codeQualityWalkthrough|Got it"
-msgstr ""
-
-msgid "codeQualityWalkthrough|Let's start by creating a new CI file."
-msgstr ""
-
-msgid "codeQualityWalkthrough|Not sure how to fix your failed job? We have compiled some tips on how to troubleshoot code quality jobs in the documentation."
-msgstr ""
-
-msgid "codeQualityWalkthrough|Read the documentation"
-msgstr ""
-
-msgid "codeQualityWalkthrough|Something went wrong. %{emojiStart}thinking%{emojiEnd} Let's fix it."
-msgstr ""
-
-msgid "codeQualityWalkthrough|To begin with code quality, we first need to create a new CI file using our code editor. We added a code quality template in the code editor to help you get started %{emojiStart}wink%{emojiEnd} .%{lineBreak}Take some time to review the template, when you are ready, use the %{strongStart}commit changes%{strongEnd} button at the bottom of the page."
-msgstr ""
-
-msgid "codeQualityWalkthrough|Troubleshoot your code quality job"
-msgstr ""
-
-msgid "codeQualityWalkthrough|View the logs"
-msgstr ""
-
-msgid "codeQualityWalkthrough|Well done! You've just automated your code quality review. %{emojiStart}raised_hands%{emojiEnd}"
-msgstr ""
-
-msgid "codeQualityWalkthrough|Your job failed. No worries - this happens. Let's view the logs, and see how we can fix it."
-msgstr ""
-
-msgid "codeQualityWalkthrough|Your pipeline can take a few minutes to run. If you enabled email notifications, you'll receive an email with your pipeline status. In the meantime, why don't you get some coffee? You earned it!"
-msgstr ""
-
 msgid "collect usage information"
 msgstr ""
 
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index 53efcc65066..d47d54747c8 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -525,24 +525,5 @@ RSpec.describe Projects::BlobController do
 
       expect(response).to redirect_to(project_blob_path(project, 'master/docs/EXAMPLE_FILE'))
     end
-
-    context 'when code_quality_walkthrough param is present' do
-      let(:default_params) { super().merge(code_quality_walkthrough: true) }
-
-      it 'redirects to the pipelines page' do
-        request
-
-        expect(response).to redirect_to(project_pipelines_path(project, code_quality_walkthrough: true))
-      end
-
-      it 'creates an "commit_created" experiment tracking event' do
-        experiment = double(track: true)
-        expect(controller).to receive(:experiment).with(:code_quality_walkthrough, namespace: project.root_ancestor).and_return(experiment)
-
-        request
-
-        expect(experiment).to have_received(:track).with(:commit_created)
-      end
-    end
   end
 end
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 283d7b49674..75d29acfbc4 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -292,10 +292,6 @@ RSpec.describe Projects::PipelinesController do
 
     subject { project.namespace }
 
-    context 'code_quality_walkthrough experiment' do
-      it_behaves_like 'tracks assignment and records the subject', :code_quality_walkthrough, :namespace
-    end
-
     context 'runners_availability_section experiment' do
       it_behaves_like 'tracks assignment and records the subject', :runners_availability_section, :namespace
     end
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 18942e48400..0700423983f 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -187,6 +187,14 @@ RSpec.describe 'New/edit issue', :js do
       end
     end
 
+    it 'displays an error message when submitting an invalid form' do
+      click_button 'Create issue'
+
+      page.within('[data-testid="issue-title-input-field"]') do
+        expect(page).to have_text(_('This field is required.'))
+      end
+    end
+
     it 'correctly updates the dropdown toggle when removing a label' do
       click_button 'Labels'
 
diff --git a/spec/frontend/code_quality_walkthrough/components/__snapshots__/step_spec.js.snap b/spec/frontend/code_quality_walkthrough/components/__snapshots__/step_spec.js.snap
deleted file mode 100644
index f17d99ad257..00000000000
--- a/spec/frontend/code_quality_walkthrough/components/__snapshots__/step_spec.js.snap
+++ /dev/null
@@ -1,174 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`When the code_quality_walkthrough URL parameter is present Code Quality Walkthrough Step component commit_ci_file step renders a popover 1`] = `
-<div>
-  <gl-popover-stub
-    container="viewport"
-    cssclasses=""
-    offset="90"
-    placement="right"
-    show=""
-    target="#js-code-quality-walkthrough"
-    triggers="manual"
-  >
-     
-    <gl-sprintf-stub
-      message="To begin with code quality, we first need to create a new CI file using our code editor. We added a code quality template in the code editor to help you get started %{emojiStart}wink%{emojiEnd} .%{lineBreak}Take some time to review the template, when you are ready, use the %{strongStart}commit changes%{strongEnd} button at the bottom of the page."
-    />
-     
-    <div
-      class="gl-mt-2 gl-text-right"
-    >
-      <gl-button-stub
-        buttontextclasses=""
-        category="tertiary"
-        href=""
-        icon=""
-        size="medium"
-        variant="link"
-      >
-        
-        Got it
-      
-      </gl-button-stub>
-    </div>
-  </gl-popover-stub>
-   
-  <!---->
-</div>
-`;
-
-exports[`When the code_quality_walkthrough URL parameter is present Code Quality Walkthrough Step component failed_pipeline step renders a popover 1`] = `
-<div>
-  <gl-popover-stub
-    container="viewport"
-    cssclasses=""
-    offset="98"
-    placement="bottom"
-    show=""
-    target="#js-code-quality-walkthrough"
-    triggers="manual"
-  >
-     
-    <gl-sprintf-stub
-      message="Your job failed. No worries - this happens. Let's view the logs, and see how we can fix it."
-    />
-     
-    <div
-      class="gl-mt-2 gl-text-right"
-    >
-      <gl-button-stub
-        buttontextclasses=""
-        category="tertiary"
-        href="/group/project/-/jobs/:id?code_quality_walkthrough=true"
-        icon=""
-        size="medium"
-        variant="link"
-      >
-        
-        View the logs
-      
-      </gl-button-stub>
-    </div>
-  </gl-popover-stub>
-   
-  <!---->
-</div>
-`;
-
-exports[`When the code_quality_walkthrough URL parameter is present Code Quality Walkthrough Step component running_pipeline step renders a popover 1`] = `
-<div>
-  <gl-popover-stub
-    container="viewport"
-    cssclasses=""
-    offset="97"
-    placement="bottom"
-    show=""
-    target="#js-code-quality-walkthrough"
-    triggers="manual"
-  >
-     
-    <gl-sprintf-stub
-      message="Your pipeline can take a few minutes to run. If you enabled email notifications, you'll receive an email with your pipeline status. In the meantime, why don't you get some coffee? You earned it!"
-    />
-     
-    <div
-      class="gl-mt-2 gl-text-right"
-    >
-      <gl-button-stub
-        buttontextclasses=""
-        category="tertiary"
-        href=""
-        icon=""
-        size="medium"
-        variant="link"
-      >
-        
-        Got it
-      
-      </gl-button-stub>
-    </div>
-  </gl-popover-stub>
-   
-  <!---->
-</div>
-`;
-
-exports[`When the code_quality_walkthrough URL parameter is present Code Quality Walkthrough Step component success_pipeline step renders a popover 1`] = `
-<div>
-  <gl-popover-stub
-    container="viewport"
-    cssclasses=""
-    offset="98"
-    placement="bottom"
-    show=""
-    target="#js-code-quality-walkthrough"
-    triggers="manual"
-  >
-     
-    <gl-sprintf-stub
-      message="A code quality job will now run every time you or your team members commit changes to your project. You can view the results of the code quality job in the job logs."
-    />
-     
-    <div
-      class="gl-mt-2 gl-text-right"
-    >
-      <gl-button-stub
-        buttontextclasses=""
-        category="tertiary"
-        href="/group/project/-/jobs/:id?code_quality_walkthrough=true"
-        icon=""
-        size="medium"
-        variant="link"
-      >
-        
-        View the logs
-      
-      </gl-button-stub>
-    </div>
-  </gl-popover-stub>
-   
-  <!---->
-</div>
-`;
-
-exports[`When the code_quality_walkthrough URL parameter is present Code Quality Walkthrough Step component troubleshoot_job step renders an alert 1`] = `
-<div>
-  <!---->
-   
-  <gl-alert-stub
-    class="gl-my-5"
-    dismissible="true"
-    dismisslabel="Dismiss"
-    primarybuttontext="Read the documentation"
-    secondarybuttonlink=""
-    secondarybuttontext=""
-    title="Troubleshoot your code quality job"
-    variant="tip"
-  >
-    
-    Not sure how to fix your failed job? We have compiled some tips on how to troubleshoot code quality jobs in the documentation.
-  
-  </gl-alert-stub>
-</div>
-`;
diff --git a/spec/frontend/code_quality_walkthrough/components/step_spec.js b/spec/frontend/code_quality_walkthrough/components/step_spec.js
deleted file mode 100644
index b43629c2f96..00000000000
--- a/spec/frontend/code_quality_walkthrough/components/step_spec.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import { GlButton, GlPopover } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import Cookies from 'js-cookie';
-import Step from '~/code_quality_walkthrough/components/step.vue';
-import { EXPERIMENT_NAME, STEPS } from '~/code_quality_walkthrough/constants';
-import { TRACKING_CONTEXT_SCHEMA } from '~/experimentation/constants';
-import { getParameterByName } from '~/lib/utils/url_utility';
-import Tracking from '~/tracking';
-
-jest.mock('~/lib/utils/url_utility', () => ({
-  ...jest.requireActual('~/lib/utils/url_utility'),
-  getParameterByName: jest.fn(),
-}));
-
-let wrapper;
-
-function factory({ step, link }) {
-  wrapper = shallowMount(Step, {
-    propsData: { step, link },
-  });
-}
-
-afterEach(() => {
-  wrapper.destroy();
-});
-
-const dummyLink = '/group/project/-/jobs/:id?code_quality_walkthrough=true';
-const dummyContext = 'experiment_context';
-
-const findButton = () => wrapper.findComponent(GlButton);
-const findPopover = () => wrapper.findComponent(GlPopover);
-
-describe('When the code_quality_walkthrough URL parameter is missing', () => {
-  beforeEach(() => {
-    getParameterByName.mockReturnValue(false);
-  });
-
-  it('does not render the component', () => {
-    factory({
-      step: STEPS.commitCiFile,
-    });
-
-    expect(findPopover().exists()).toBe(false);
-  });
-});
-
-describe('When the code_quality_walkthrough URL parameter is present', () => {
-  beforeEach(() => {
-    getParameterByName.mockReturnValue(true);
-    Cookies.set(EXPERIMENT_NAME, { data: dummyContext });
-  });
-
-  afterEach(() => {
-    Cookies.remove(EXPERIMENT_NAME);
-  });
-
-  describe('When mounting the component', () => {
-    beforeEach(() => {
-      jest.spyOn(Tracking, 'event');
-
-      factory({
-        step: STEPS.commitCiFile,
-      });
-    });
-
-    it('tracks an event', () => {
-      expect(Tracking.event).toHaveBeenCalledWith(
-        EXPERIMENT_NAME,
-        `${STEPS.commitCiFile}_displayed`,
-        {
-          context: {
-            schema: TRACKING_CONTEXT_SCHEMA,
-            data: dummyContext,
-          },
-        },
-      );
-    });
-  });
-
-  describe('When updating the component', () => {
-    beforeEach(() => {
-      factory({
-        step: STEPS.runningPipeline,
-      });
-
-      jest.spyOn(Tracking, 'event');
-
-      wrapper.setProps({ step: STEPS.successPipeline });
-    });
-
-    it('tracks an event', () => {
-      expect(Tracking.event).toHaveBeenCalledWith(
-        EXPERIMENT_NAME,
-        `${STEPS.successPipeline}_displayed`,
-        {
-          context: {
-            schema: TRACKING_CONTEXT_SCHEMA,
-            data: dummyContext,
-          },
-        },
-      );
-    });
-  });
-
-  describe('When dismissing a popover', () => {
-    beforeEach(() => {
-      factory({
-        step: STEPS.commitCiFile,
-      });
-
-      jest.spyOn(Cookies, 'set');
-      jest.spyOn(Tracking, 'event');
-
-      findButton().vm.$emit('click');
-    });
-
-    it('sets a cookie', () => {
-      expect(Cookies.set).toHaveBeenCalledWith(
-        EXPERIMENT_NAME,
-        { commit_ci_file: true, data: dummyContext },
-        { expires: 365, secure: false },
-      );
-    });
-
-    it('removes the popover', () => {
-      expect(findPopover().exists()).toBe(false);
-    });
-
-    it('tracks an event', () => {
-      expect(Tracking.event).toHaveBeenCalledWith(
-        EXPERIMENT_NAME,
-        `${STEPS.commitCiFile}_dismissed`,
-        {
-          context: {
-            schema: TRACKING_CONTEXT_SCHEMA,
-            data: dummyContext,
-          },
-        },
-      );
-    });
-  });
-
-  describe('Code Quality Walkthrough Step component', () => {
-    describe.each(Object.values(STEPS))('%s step', (step) => {
-      it(`renders ${step === STEPS.troubleshootJob ? 'an alert' : 'a popover'}`, () => {
-        const options = { step };
-        if ([STEPS.successPipeline, STEPS.failedPipeline].includes(step)) {
-          options.link = dummyLink;
-        }
-        factory(options);
-
-        expect(wrapper.element).toMatchSnapshot();
-      });
-    });
-  });
-});
diff --git a/spec/frontend/jobs/components/job_app_spec.js b/spec/frontend/jobs/components/job_app_spec.js
index d4e1e711777..06ebcd7f134 100644
--- a/spec/frontend/jobs/components/job_app_spec.js
+++ b/spec/frontend/jobs/components/job_app_spec.js
@@ -34,7 +34,6 @@ describe('Job App', () => {
   const props = {
     artifactHelpUrl: 'help/artifact',
     deploymentHelpUrl: 'help/deployment',
-    codeQualityHelpPath: '/help/code_quality',
     runnerSettingsUrl: 'settings/ci-cd/runners',
     terminalPath: 'jobs/123/terminal',
     projectPath: 'user-name/project-name',
diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js
index 1c84e20c9e1..ca19a6d337a 100644
--- a/spec/frontend/pipelines/pipelines_spec.js
+++ b/spec/frontend/pipelines/pipelines_spec.js
@@ -10,7 +10,6 @@ import { TEST_HOST } from 'helpers/test_constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import Api from '~/api';
-import { getExperimentData, getExperimentVariant } from '~/experimentation/utils';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import NavigationControls from '~/pipelines/components/pipelines_list/nav_controls.vue';
@@ -25,11 +24,6 @@ import TablePagination from '~/vue_shared/components/pagination/table_pagination
 import { stageReply, users, mockSearch, branches } from './mock_data';
 
 jest.mock('~/flash');
-jest.mock('~/experimentation/utils', () => ({
-  ...jest.requireActual('~/experimentation/utils'),
-  getExperimentData: jest.fn().mockReturnValue(false),
-  getExperimentVariant: jest.fn().mockReturnValue('control'),
-}));
 
 const mockProjectPath = 'twitter/flight';
 const mockProjectId = '21';
@@ -50,7 +44,6 @@ describe('Pipelines', () => {
     ciLintPath: '/ci/lint',
     resetCachePath: `${mockProjectPath}/settings/ci_cd/reset_cache`,
     newPipelinePath: `${mockProjectPath}/pipelines/new`,
-    codeQualityPagePath: `${mockProjectPath}/-/new/master?commit_message=Add+.gitlab-ci.yml+and+create+a+code+quality+job&file_name=.gitlab-ci.yml&template=Code-Quality`,
     ciRunnerSettingsPath: `${mockProjectPath}/-/settings/ci_cd#js-runners-settings`,
   };
 
@@ -557,35 +550,6 @@ describe('Pipelines', () => {
         expect(wrapper.findComponent(PipelinesCiTemplates).exists()).toBe(true);
       });
 
-      describe('when the code_quality_walkthrough experiment is active', () => {
-        beforeAll(() => {
-          getExperimentData.mockImplementation((name) => name === 'code_quality_walkthrough');
-        });
-
-        describe('the control state', () => {
-          beforeAll(() => {
-            getExperimentVariant.mockReturnValue('control');
-          });
-
-          it('renders the CI/CD templates', () => {
-            expect(wrapper.findComponent(PipelinesCiTemplates).exists()).toBe(true);
-          });
-        });
-
-        describe('the candidate state', () => {
-          beforeAll(() => {
-            getExperimentVariant.mockReturnValue('candidate');
-          });
-
-          it('renders another CTA button', () => {
-            expect(findEmptyState().findComponent(GlButton).text()).toBe('Add a code quality job');
-            expect(findEmptyState().findComponent(GlButton).attributes('href')).toBe(
-              paths.codeQualityPagePath,
-            );
-          });
-        });
-      });
-
       it('does not render filtered search', () => {
         expect(findFilteredSearch().exists()).toBe(false);
       });
diff --git a/spec/helpers/ci/pipelines_helper_spec.rb b/spec/helpers/ci/pipelines_helper_spec.rb
index 1baaefe0b7f..a7a96efcb3f 100644
--- a/spec/helpers/ci/pipelines_helper_spec.rb
+++ b/spec/helpers/ci/pipelines_helper_spec.rb
@@ -120,7 +120,6 @@ RSpec.describe Ci::PipelinesHelper do
                                            :has_gitlab_ci,
                                            :pipeline_editor_path,
                                            :suggested_ci_templates,
-                                           :code_quality_page_path,
                                            :ci_runner_settings_path])
     end
 
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index e4a08bd56c8..33a4a1b9d4c 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -747,10 +747,4 @@ RSpec.describe ProjectPresenter do
       end
     end
   end
-
-  describe '#add_code_quality_ci_yml_path' do
-    subject { presenter.add_code_quality_ci_yml_path }
-
-    it { is_expected.to match(/code_quality_walkthrough=true.*template=Code-Quality/) }
-  end
 end
diff --git a/spec/requests/groups/deploy_tokens_controller_spec.rb b/spec/requests/groups/deploy_tokens_controller_spec.rb
new file mode 100644
index 00000000000..b3dce9b9cf1
--- /dev/null
+++ b/spec/requests/groups/deploy_tokens_controller_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::DeployTokensController do
+  let_it_be(:group) { create(:group) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [group]) }
+  let_it_be(:params) do
+    { id: deploy_token.id, group_id: group }
+  end
+
+  before do
+    group.add_owner(user)
+
+    sign_in(user)
+  end
+
+  describe 'PUT /groups/:group_path_with_namespace/-/deploy_tokens/:id/revoke' do
+    subject(:put_revoke) do
+      put "/groups/#{group.full_path}/-/deploy_tokens/#{deploy_token.id}/revoke", params: params
+    end
+
+    it 'invokes the Groups::DeployTokens::RevokeService' do
+      expect(deploy_token.revoked).to eq(false)
+      expect(Groups::DeployTokens::RevokeService).to receive(:new).and_call_original
+
+      put_revoke
+
+      expect(deploy_token.reload.revoked).to eq(true)
+    end
+
+    it 'redirects to group repository settings with correct anchor' do
+      put_revoke
+
+      expect(response).to have_gitlab_http_status(:redirect)
+      expect(response).to redirect_to(group_settings_repository_path(group, anchor: 'js-deploy-tokens'))
+    end
+  end
+end
diff --git a/spec/serializers/pipeline_details_entity_spec.rb b/spec/serializers/pipeline_details_entity_spec.rb
index 128f1922887..67f8860ed4a 100644
--- a/spec/serializers/pipeline_details_entity_spec.rb
+++ b/spec/serializers/pipeline_details_entity_spec.rb
@@ -70,20 +70,6 @@ RSpec.describe PipelineDetailsEntity do
           expect(subject[:flags][:retryable]).to eq false
         end
       end
-
-      it 'does not contain code_quality_build_path in details' do
-        expect(subject[:details]).not_to include :code_quality_build_path
-      end
-
-      context 'when option code_quality_walkthrough is set and pipeline is a success' do
-        let(:entity) do
-          described_class.represent(pipeline, request: request, code_quality_walkthrough: true)
-        end
-
-        it 'contains details.code_quality_build_path' do
-          expect(subject[:details]).to include :code_quality_build_path
-        end
-      end
     end
 
     context 'when pipeline is cancelable' do
diff --git a/spec/services/groups/deploy_tokens/revoke_service_spec.rb b/spec/services/groups/deploy_tokens/revoke_service_spec.rb
new file mode 100644
index 00000000000..fcf11bbb8e6
--- /dev/null
+++ b/spec/services/groups/deploy_tokens/revoke_service_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::DeployTokens::RevokeService do
+  let_it_be(:entity) { create(:group) }
+  let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [entity]) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:deploy_token_params) { { id: deploy_token.id } }
+
+  describe '#execute' do
+    subject { described_class.new(entity, user, deploy_token_params).execute }
+
+    it "revokes a group deploy token" do
+      expect(deploy_token.revoked).to eq(false)
+
+      expect { subject }.to change { deploy_token.reload.revoked }.to eq(true)
+    end
+
+    context 'invalid token id' do
+      let(:deploy_token_params) { { token_id: non_existing_record_id } }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end
-- 
cgit v1.2.1