diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index ff30ca95eda..479586adf40 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-575e8b7baeb800a8d0d0f28a80c0461a7a0db741
+12794f56ea8f6d289298e9befd2ee6fbd56f4dc4
diff --git a/app/assets/javascripts/ci/job_details/components/log/line.vue b/app/assets/javascripts/ci/job_details/components/log/line.vue
index b04a6b7ec33..16781e745b3 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line.vue
@@ -69,7 +69,7 @@ export default {
         class: [
           'js-log-line',
           'job-log-line',
-          { 'gl-bg-gray-700': isHighlighted || applyHashHighlight },
+          { 'job-log-line-highlight': isHighlighted || applyHashHighlight },
         ],
       },
       [
diff --git a/app/assets/javascripts/ci/job_details/components/log/line_header.vue b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
index 948853bd898..2a3e3ad3459 100644
--- a/app/assets/javascripts/ci/job_details/components/log/line_header.vue
+++ b/app/assets/javascripts/ci/job_details/components/log/line_header.vue
@@ -70,7 +70,7 @@ export default {
 <template>
   <div
     class="js-log-line job-log-line-header job-log-line"
-    :class="{ 'gl-bg-gray-700': isHighlighted || applyHashHighlight }"
+    :class="{ 'job-log-line-highlight': isHighlighted || applyHashHighlight }"
     role="button"
     @click="handleOnClick"
   >
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue b/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue
new file mode 100644
index 00000000000..45404144fd8
--- /dev/null
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue
@@ -0,0 +1,40 @@
+<script>
+import { GlTooltipDirective } from '@gitlab/ui';
+import { __ } from '~/locale';
+import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+/**
+ * Renders a downstream pipeline dropdown for the pipeline mini graph.
+ */
+export default {
+  name: 'DownstreamPipelineDropdown',
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  components: {
+    CiIcon,
+  },
+  props: {
+    pipeline: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    pipelineTooltipText() {
+      const name = this.pipeline?.name || this.pipeline?.project?.name || __('Downstream pipeline');
+      const status = this.pipeline?.detailedStatus?.label || __('unknown');
+
+      return `${name} - ${status}`;
+    },
+  },
+};
+</script>
+
+<template>
+  <ci-icon
+    v-gl-tooltip.hover
+    :title="pipelineTooltipText"
+    :status="pipeline.detailedStatus"
+    :show-tooltip="false"
+  />
+</template>
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipelines.vue b/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipelines.vue
index 64c29a78c50..71fcc3be4a1 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipelines.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/downstream_pipelines.vue
@@ -1,7 +1,8 @@
 <script>
 import { GlTooltipDirective } from '@gitlab/ui';
 import { sprintf, s__ } from '~/locale';
-import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import DownstreamPipelineDropdown from './downstream_pipeline_dropdown.vue';
+
 /**
  * Renders the downstream portion of the pipeline mini graph.
  */
@@ -11,7 +12,7 @@ export default {
     GlTooltip: GlTooltipDirective,
   },
   components: {
-    CiIcon,
+    DownstreamPipelineDropdown,
   },
   props: {
     pipelines: {
@@ -51,24 +52,16 @@ export default {
       });
     },
   },
-  methods: {
-    pipelineTooltipText(pipeline) {
-      return `${pipeline?.project?.name} - ${pipeline?.detailedStatus?.label}`;
-    },
-  },
 };
 </script>
 
 <template>
   <span v-if="pipelines" class="gl-inline-flex gl-gap-2 gl-align-middle">
-    <ci-icon
+    <downstream-pipeline-dropdown
       v-for="pipeline in pipelinesTrimmed"
       :key="pipeline.id"
-      v-gl-tooltip.hover
-      :title="pipelineTooltipText(pipeline)"
-      :status="pipeline.detailedStatus"
-      :show-tooltip="false"
-      data-testid="downstream-pipelines"
+      :pipeline="pipeline"
+      @jobActionExecuted="$emit('jobActionExecuted')"
     />
 
     <a
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_downstream_pipeline_jobs.query.graphql b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_downstream_pipeline_jobs.query.graphql
new file mode 100644
index 00000000000..f9b64c981bc
--- /dev/null
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_downstream_pipeline_jobs.query.graphql
@@ -0,0 +1,38 @@
+query getDownstreamPipelineJobs($fullPath: ID!, $iid: ID!) {
+  project(fullPath: $fullPath) {
+    id
+    pipeline(iid: $iid) {
+      id
+      path
+      name
+      project {
+        id
+        name
+      }
+      jobs {
+        nodes {
+          id
+          detailedStatus {
+            id
+            action {
+              id
+              confirmationMessage
+              icon
+              path
+              title
+            }
+            detailsPath
+            group
+            hasDetails
+            icon
+            name
+            tooltip
+          }
+          name
+          scheduled
+          scheduledAt
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
index b4fef2d43f6..1849f148382 100644
--- a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
+++ b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
@@ -19,6 +19,7 @@ import { fetchPolicies } from '~/lib/graphql';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, n__ } from '~/locale';
+import { createAlert } from '~/alert';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import {
   IDENTITY_VERIFICATION_REQUIRED_ERROR,
@@ -348,35 +349,45 @@ export default {
     },
     async createPipeline() {
       this.submitted = true;
+      try {
+        const {
+          data: {
+            pipelineCreate: { errors, pipeline },
+          },
+        } = await this.$apollo.mutate({
+          mutation: createPipelineMutation,
+          variables: {
+            input: {
+              projectPath: this.projectPath,
+              ref: this.refShortName,
+              variables: filterVariables(this.variables),
+            },
+          },
+        });
 
-      const { data } = await this.$apollo.mutate({
-        mutation: createPipelineMutation,
-        variables: {
-          endpoint: this.pipelinesPath,
-          // send shortName as fall back for query params
-          // https://gitlab.com/gitlab-org/gitlab/-/issues/287815
-          ref: this.refQueryParam,
-          variablesAttributes: filterVariables(this.variables),
-        },
-      });
+        const pipelineErrors = pipeline?.errorMessages?.nodes?.map((node) => node?.content) || '';
+        const totalWarnings = pipeline?.warningMessages?.nodes?.length || 0;
 
-      const { id, errors, totalWarnings, warnings } = data.createPipeline;
+        if (pipeline?.path) {
+          visitUrl(pipeline.path);
+        } else if (errors?.length > 0 || pipelineErrors.length || totalWarnings) {
+          const warnings = pipeline?.warningMessages?.nodes?.map((node) => node?.content) || '';
+          const error = errors[0] || pipelineErrors[0] || '';
 
-      if (id) {
-        visitUrl(`${this.pipelinesPath}/${id}`);
-        return;
+          this.reportError({
+            title: i18n.submitErrorTitle,
+            error,
+            warnings,
+            totalWarnings,
+          });
+        }
+      } catch (error) {
+        createAlert({ message: i18n.submitErrorTitle });
+        Sentry.captureException(error);
       }
 
       // always re-enable submit button
       this.submitted = false;
-      const [error] = errors;
-
-      this.reportError({
-        title: i18n.submitErrorTitle,
-        error,
-        warnings,
-        totalWarnings,
-      });
     },
     onRefsLoadingError(error) {
       this.reportError({ title: i18n.refsLoadingErrorTitle });
diff --git a/app/assets/javascripts/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql b/app/assets/javascripts/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql
index a76e8f6b95b..f3fea7af37d 100644
--- a/app/assets/javascripts/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql
+++ b/app/assets/javascripts/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql
@@ -1,9 +1,23 @@
-mutation createPipeline($endpoint: String, $ref: String, $variablesAttributes: Array) {
-  createPipeline(endpoint: $endpoint, ref: $ref, variablesAttributes: $variablesAttributes)
-    @client {
-    id
+# This name is specifically needed for backend logic
+mutation internalPipelineCreate($input: PipelineCreateInput!) {
+  pipelineCreate(input: $input) {
+    clientMutationId
     errors
-    totalWarnings
-    warnings
+    pipeline {
+      id
+      path
+      errorMessages {
+        nodes {
+          id
+          content
+        }
+      }
+      warningMessages {
+        nodes {
+          id
+          content
+        }
+      }
+    }
   }
 }
diff --git a/app/assets/javascripts/ci/pipeline_new/graphql/resolvers.js b/app/assets/javascripts/ci/pipeline_new/graphql/resolvers.js
deleted file mode 100644
index 7b0f58e8cf9..00000000000
--- a/app/assets/javascripts/ci/pipeline_new/graphql/resolvers.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import axios from '~/lib/utils/axios_utils';
-
-export const resolvers = {
-  Mutation: {
-    createPipeline: (_, { endpoint, ref, variablesAttributes }) => {
-      return axios
-        .post(endpoint, { ref, variables_attributes: variablesAttributes })
-        .then((response) => {
-          const { id } = response.data;
-          return {
-            id,
-            errors: [],
-            totalWarnings: 0,
-            warnings: [],
-          };
-        })
-        .catch((err) => {
-          const { errors = [], totalWarnings = 0, warnings = [] } = err.response.data;
-
-          return {
-            id: null,
-            errors,
-            totalWarnings,
-            warnings,
-          };
-        });
-    },
-  },
-};
diff --git a/app/assets/javascripts/ci/pipeline_new/index.js b/app/assets/javascripts/ci/pipeline_new/index.js
index 73f2ec40ac2..61d3c0093a7 100644
--- a/app/assets/javascripts/ci/pipeline_new/index.js
+++ b/app/assets/javascripts/ci/pipeline_new/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
 import PipelineNewForm from './components/pipeline_new_form.vue';
-import { resolvers } from './graphql/resolvers';
 
 const mountPipelineNewForm = (el) => {
   const {
@@ -31,7 +30,7 @@ const mountPipelineNewForm = (el) => {
   Vue.use(VueApollo);
 
   const apolloProvider = new VueApollo({
-    defaultClient: createDefaultClient(resolvers),
+    defaultClient: createDefaultClient(),
   });
 
   return new Vue({
diff --git a/app/assets/javascripts/ci/pipeline_new/utils/filter_variables.js b/app/assets/javascripts/ci/pipeline_new/utils/filter_variables.js
index 57ce3d13a9a..59169b5624c 100644
--- a/app/assets/javascripts/ci/pipeline_new/utils/filter_variables.js
+++ b/app/assets/javascripts/ci/pipeline_new/utils/filter_variables.js
@@ -1,13 +1,16 @@
-// We need to filter out blank variables
-// and filter out variables that have no key
-// before sending to the API to create a pipeline.
+/**
+ * We need to filter out blank variables as well as variables that have no key
+ * and then format the variables to GraphQL
+ * before sending to the API to create a pipeline.
+ */
 
 export default (variables) => {
   return variables
     .filter(({ key }) => key !== '')
-    .map(({ variable_type, key, value }) => ({
-      variable_type,
+    .map(({ key, value, variable_type: variableType }) => ({
       key,
-      secret_value: value,
+      value,
+      // CiVariableType must be all caps
+      variableType: variableType.toUpperCase(),
     }));
 };
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 7ba6cfa72b4..0897c318451 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -475,6 +475,7 @@ export default {
       'collapseAllFiles',
       'setDiffViewType',
       'setShowWhitespace',
+      'goToFile',
     ]),
     ...mapActions('findingsDrawer', ['setDrawer']),
     closeDrawer() {
@@ -804,7 +805,11 @@ export default {
         :data-can-create-note="getNoteableData.current_user.can_create_note"
         class="files gl-mt-2 gl-flex"
       >
-        <diffs-file-tree :visible="renderFileTree" @toggled="fileTreeToggled" />
+        <diffs-file-tree
+          :visible="renderFileTree"
+          @toggled="fileTreeToggled"
+          @clickFile="goToFile({ path: $event.path })"
+        />
         <div class="col-12 col-md-auto diff-files-holder">
           <commit-widget v-if="commit" :commit="commit" :collapsible="false" />
           <gl-alert
diff --git a/app/assets/javascripts/diffs/components/diffs_file_tree.vue b/app/assets/javascripts/diffs/components/diffs_file_tree.vue
index 418bba2a058..637dec7ae28 100644
--- a/app/assets/javascripts/diffs/components/diffs_file_tree.vue
+++ b/app/assets/javascripts/diffs/components/diffs_file_tree.vue
@@ -65,6 +65,6 @@ export default {
       side="right"
       @resize-end="cacheTreeListWidth"
     />
-    <tree-list :hide-file-stats="hideFileStats" />
+    <tree-list :hide-file-stats="hideFileStats" @clickFile="$emit('clickFile', $event)" />
   </div>
 </template>
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue
index 6b9b96741fb..787053168f1 100644
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@@ -150,7 +150,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions('diffs', ['toggleTreeOpen', 'goToFile', 'setRenderTreeList', 'setTreeOpen']),
+    ...mapActions('diffs', ['toggleTreeOpen', 'setRenderTreeList', 'setTreeOpen']),
 
     scrollVirtualScrollerToFileHash(hash) {
       const item = document.querySelector(`[data-file-row="${hash}"]`);
@@ -239,7 +239,7 @@ export default {
                 class="gl-relative !gl-m-1"
                 :data-file-row="item.fileHash"
                 @toggleTreeOpen="toggleTreeOpen"
-                @clickFile="(path) => goToFile({ path })"
+                @clickFile="$emit('clickFile', $event)"
               />
             </template>
             <template #after>
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_status.vue b/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
index 4ab336e6492..e355ec6e6b4 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
@@ -42,12 +42,17 @@ export default {
 </script>
 
 <template>
-  <div>
-    <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" icon-size="sm">
+  <div class="gl-flex gl-flex-col gl-items-start gl-gap-2">
+    <gl-badge
+      :icon="mappedStatus.icon"
+      icon-optically-aligned
+      :variant="mappedStatus.variant"
+      class="gl-pr-3"
+    >
       {{ mappedStatus.text }}
     </gl-badge>
 
-    <div v-if="failuresHref" class="gl-mt-2">
+    <div v-if="failuresHref">
       <gl-link :href="failuresHref">{{ s__('Import|Show errors') }} &gt;</gl-link>
     </div>
   </div>
diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 4d94f5a4f09..70230d52e0b 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -80,9 +80,6 @@ export default {
     toggleTreeOpen(path) {
       this.$emit('toggleTreeOpen', path);
     },
-    clickedFile(path) {
-      this.$emit('clickFile', path);
-    },
     clickFile() {
       // Manual Action if a tree is selected/opened
       if (this.isTree && this.hasUrlAtCurrentRoute()) {
@@ -91,7 +88,7 @@ export default {
 
       if (this.$router && !this.hasUrlAtCurrentRoute()) this.$router.push(this.fileRouterUrl);
 
-      if (this.isBlob) this.clickedFile(this.file.path);
+      if (this.isBlob) this.$emit('clickFile', this.file);
     },
     scrollIntoView(isInit = false) {
       const block = isInit && this.isTree ? 'center' : 'nearest';
diff --git a/app/assets/javascripts/vue_shared/components/topic_badges.vue b/app/assets/javascripts/vue_shared/components/topic_badges.vue
index 3d1312afc7e..83bf4edf971 100644
--- a/app/assets/javascripts/vue_shared/components/topic_badges.vue
+++ b/app/assets/javascripts/vue_shared/components/topic_badges.vue
@@ -4,6 +4,7 @@
  */
 import { GlBadge, GlPopover, GlTooltipDirective } from '@gitlab/ui';
 import uniqueId from 'lodash/uniqueId';
+import { joinPaths } from '~/lib/utils/url_utility';
 import { s__, sprintf } from '~/locale';
 import { truncate } from '~/lib/utils/text_utility';
 
@@ -55,7 +56,9 @@ export default {
   },
   methods: {
     topicPath(topic) {
-      return `/explore/projects/topics/${encodeURIComponent(topic)}`;
+      const explorePath = `/explore/projects/topics/${encodeURIComponent(topic)}`;
+
+      return joinPaths(gon.relative_url_root || '', explorePath);
     },
     topicTitle(topic) {
       return truncate(topic, MAX_TOPIC_TITLE_LENGTH);
diff --git a/app/assets/stylesheets/bootstrap_migration_components.scss b/app/assets/stylesheets/bootstrap_migration_components.scss
index 6bbb207d28b..e046a1951b5 100644
--- a/app/assets/stylesheets/bootstrap_migration_components.scss
+++ b/app/assets/stylesheets/bootstrap_migration_components.scss
@@ -108,7 +108,7 @@ input[type='file'] {
   height: 0;
   margin: 4px 0;
   overflow: hidden;
-  border-top: 1px solid $border-color;
+  @apply gl-border-t;
 }
 
 .info-well {
diff --git a/app/assets/stylesheets/bootstrap_migration_reset.scss b/app/assets/stylesheets/bootstrap_migration_reset.scss
index ba683b015ba..f30296b243d 100644
--- a/app/assets/stylesheets/bootstrap_migration_reset.scss
+++ b/app/assets/stylesheets/bootstrap_migration_reset.scss
@@ -9,7 +9,7 @@ body {
 }
 
 legend {
-  border-bottom: 1px solid $border-color;
+  @apply gl-border-b;
   margin-bottom: 20px;
 }
 
diff --git a/app/assets/stylesheets/bootstrap_migration_variables.scss b/app/assets/stylesheets/bootstrap_migration_variables.scss
index e0e44aed1fd..9e7f76d8572 100644
--- a/app/assets/stylesheets/bootstrap_migration_variables.scss
+++ b/app/assets/stylesheets/bootstrap_migration_variables.scss
@@ -8,7 +8,7 @@ $brand-danger: $red-500;
 
 $border-radius-base: $gl-border-radius-base;
 
-$input-border: $border-color;
+$input-border: $gl-border-color-default;
 
 $padding-base-vertical: $gl-vert-padding;
 $padding-base-horizontal: $gl-padding;
diff --git a/app/assets/stylesheets/color_modes/_dark.scss b/app/assets/stylesheets/color_modes/_dark.scss
index 1709960be39..a728a8f78e2 100644
--- a/app/assets/stylesheets/color_modes/_dark.scss
+++ b/app/assets/stylesheets/color_modes/_dark.scss
@@ -1,7 +1,5 @@
 @import '@gitlab/ui/src/tokens/build/scss/tokens.dark';
 
-$border-color: #4f4f4f;
-
 $body-bg: $gray-10;
 $input-bg: $white;
 $input-focus-bg: $white;
diff --git a/app/assets/stylesheets/errors.scss b/app/assets/stylesheets/errors.scss
index aa130f2e3cb..b0e02e35c93 100644
--- a/app/assets/stylesheets/errors.scss
+++ b/app/assets/stylesheets/errors.scss
@@ -72,7 +72,7 @@ a {
 .error-nav {
   margin: $gl-spacing-scale-6 0 0 0;
   padding: $gl-spacing-scale-4 0 0 0;
-  border-top: 1px solid $border-color;
+  border-top: 1px solid $gl-border-color-default;
 
   li {
     display: block;
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index c4e39fe5947..fffb826ee45 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -24,7 +24,7 @@
   width: $award-emoji-width;
   font-size: 14px;
   background-color: $white;
-  border: 1px solid $border-color;
+  @apply gl-border;
   border-radius: $border-radius-base;
   box-shadow: 0 6px 12px $award-emoji-menu-shadow;
   pointer-events: none;
@@ -129,19 +129,6 @@
 }
 
 .gl-button.btn.award-control {
-  margin: 4px 8px 4px 0;
-
-  &.disabled {
-    cursor: default;
-
-    &:hover,
-    &:focus,
-    &:active {
-      background-color: $white;
-      border-color: $border-color;
-    }
-  }
-
   &.active,
   &:hover,
   &:active,
diff --git a/app/assets/stylesheets/framework/breadcrumbs.scss b/app/assets/stylesheets/framework/breadcrumbs.scss
index 81f22630699..1521f9990a0 100644
--- a/app/assets/stylesheets/framework/breadcrumbs.scss
+++ b/app/assets/stylesheets/framework/breadcrumbs.scss
@@ -6,7 +6,7 @@
 
   .avatar-tile {
     margin-right: 4px;
-    border: 1px solid $border-color;
+    @apply gl-border;
     border-radius: 50%;
     vertical-align: sub;
   }
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index f4a700e01d1..1550b5c43d3 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -278,12 +278,11 @@ li.note {
 
 // these classes override styles from the dropzone node package
 .dropzone .dz-preview .dz-progress {
-  border-color: $border-color !important;
+  @apply gl-border #{!important};
 
   .dz-upload {
     background: $green-500 !important;
   }
-
 }
 
 .dz-message {
@@ -407,7 +406,7 @@ li.note {
   padding-bottom: $gl-spacing-scale-6;
   margin: 0;
 
-  border-top: 1px solid $border-color;
+  @apply gl-border-t;
 }
 
 .gl-pseudo-placeholder:empty::before {
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index 8b523b6f80d..0105ef31f95 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -122,17 +122,17 @@ $diff-file-header: 41px;
       img {
         border: 1px solid $white;
         background-image: linear-gradient(45deg,
-        $border-color 25%,
+        var(--gl-border-color-default) 25%,
         transparent 25%,
         transparent 75%,
-        $border-color 75%,
-        $border-color 100%),
+        var(--gl-border-color-default) 75%,
+        var(--gl-border-color-default) 100%),
           linear-gradient(45deg,
-        $border-color 25%,
+        var(--gl-border-color-default) 25%,
         transparent 25%,
         transparent 75%,
-        $border-color 75%,
-        $border-color 100%);
+        var(--gl-border-color-default) 75%,
+        var(--gl-border-color-default) 100%);
         background-size: 10px 10px;
         background-position: 0 0, 5px 5px;
         max-width: 100%;
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 227f16a602a..08bc1c935b0 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -88,7 +88,7 @@
 
 .md-suggestion-diff {
   display: table !important;
-  border: 1px solid $border-color !important;
+  @apply gl-border #{!important};
 
   td {
     border: 0 !important;
@@ -110,7 +110,7 @@
   align-items: center;
   justify-content: space-between;
   background-color: $gray-10;
-  border: 1px solid $border-color;
+  @apply gl-border;
   border-radius: $gl-border-radius-base $gl-border-radius-base 0 0;
 }
 
diff --git a/app/assets/stylesheets/framework/responsive_tables.scss b/app/assets/stylesheets/framework/responsive_tables.scss
index 60000c5fa82..197aa7360e4 100644
--- a/app/assets/stylesheets/framework/responsive_tables.scss
+++ b/app/assets/stylesheets/framework/responsive_tables.scss
@@ -19,8 +19,7 @@
 
 .gl-responsive-table-row {
   margin-top: 10px;
-  border: 1px solid $border-color;
-  @apply gl-text-subtle;
+  @apply gl-border gl-text-subtle;
 
   &.gl-responsive-table-row-clickable {
     &:hover {
@@ -92,7 +91,7 @@
     align-self: stretch;
     min-height: 0;
     background-color: $gray-50;
-    border-top: 1px solid $border-color;
+    @apply gl-border-t;
 
     .table-action-buttons {
       display: flex;
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
index f4023c3ca16..e1bde2b291f 100644
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -6,7 +6,7 @@
   margin: 0;
   list-style: none;
   height: auto;
-  border-bottom: 1px solid $border-color;
+  @apply gl-border-b;
 
   li:not(.md-header-toolbar) {
     display: flex;
@@ -328,7 +328,7 @@
 
   &.activities {
     display: flex;
-    border-bottom: 1px solid $border-color;
+    @apply gl-border-b;
     align-items: center;
 
     .nav-links {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 6af3aaf3138..3901f077138 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -150,7 +150,7 @@
     .block {
       padding: 16px 0;
       width: 250px;
-      border-bottom: 1px solid $border-color;
+      @apply gl-border-b;
     }
   }
 
@@ -249,10 +249,10 @@
   @apply gl-text-subtle;
   display: flex;
   align-items: center;
-  border-bottom: 1px solid $border-color;
+  @apply gl-border-b;
 
   &:hover {
-    background-color: $border-color;
+    background-color: $gray-100;
     @apply gl-text-default;
   }
 }
@@ -569,7 +569,7 @@
     }
 
     .participants {
-      border-bottom: 1px solid $border-color;
+      @apply gl-border-b;
     }
 
     .hide-collapsed {
@@ -581,7 +581,7 @@
       height: $sidebar-toggle-height;
       margin-top: 0;
       margin-left: 0;
-      border-bottom: 1px solid $border-color !important;
+      @apply gl-border-b #{!important};
       border-radius: 0;
     }
 
diff --git a/app/assets/stylesheets/framework/tabs.scss b/app/assets/stylesheets/framework/tabs.scss
index d429d380fcd..1ad0f2ce71d 100644
--- a/app/assets/stylesheets/framework/tabs.scss
+++ b/app/assets/stylesheets/framework/tabs.scss
@@ -1,13 +1,13 @@
 .gitlab-tabs {
   background: $gray-10;
-  border: 1px solid $border-color;
+  @apply gl-border;
   flex-wrap: nowrap;
 
   li {
     width: 50%;
 
     &:not(:last-child) {
-      border-right: 1px solid $border-color;
+      @apply gl-border-r;
     }
 
     &.active {
@@ -22,7 +22,7 @@
 }
 
 .gitlab-tab-content {
-  border: 1px solid $border-color;
+  @apply gl-border;
   border-top: 0;
   margin-bottom: $gl-padding;
 
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index f87562f4aa9..aa819b2eed3 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -82,7 +82,7 @@
   // to make room for the summary toggle
   details summary {
     @apply gl-font-bold;
-    
+
     h1, h2, h3, h4, h5, h6 {
       a.anchor {
         @apply -gl-ml-7;
@@ -190,7 +190,7 @@
 
     td,
     th {
-      border: 1px solid $border-color;
+      @apply gl-border;
     }
 
     tr {
@@ -615,7 +615,8 @@
   }
 
   .exampleblock > div:nth-of-type(1) {
-    border: $gl-border-size-3 solid $border-color;
+    @apply gl-border;
+    border-width: $gl-border-size-3;
     border-radius: $gl-border-radius-base;
     padding: $gl-padding-12 $gl-padding-24;
 
@@ -832,7 +833,7 @@ wbr {
     content: '';
     width: 16rem;
     max-width: 100%;
-    border-top: 1px solid $border-color;
+    @apply gl-border-t;
     position: absolute;
     top: 0;
     left: 0;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index e2fc18ca33d..4b89a67cdf5 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -68,7 +68,6 @@ $purple-light: #ede8fb !default;
 /*
  * UI elements
  */
-$border-color: $gray-100;
 $well-expand-item: #e8f2f7 !default;
 
 /*
@@ -234,7 +233,6 @@ $dropdown-max-height-lg: 445px;
 $dropdown-vertical-offset: 4px;
 $dropdown-title-btn-color: #bfbfbf;
 $dropdown-loading-bg: rgba($white, 0.6);
-$dropdown-toggle-active-border-color: darken($border-color, 14%);
 $dropdown-fade-mask-height: 32px;
 $dropdown-member-form-control-width: 163px;
 
diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss
index 9a93742c608..1b4632822da 100644
--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -12,8 +12,8 @@ $font-family-sans-serif: $regular-font;
 $font-family-monospace: $monospace-font;
 $btn-line-height: 20px;
 $table-accent-bg: $gray-10;
-$table-border-color: $gray-100;
-$card-border-color: $border-color;
+$table-border-color: $gl-border-color-default;
+$card-border-color: $gl-border-color-default;
 $card-cap-bg: $gray-10 !default;
 $success: $green-500;
 $info: $blue-500;
@@ -26,7 +26,7 @@ $dropdown-item-padding-y: 8px;
 $dropdown-item-padding-x: 12px;
 $popover-max-width: 300px;
 $popover-border-width: 1px;
-$popover-border-color: $border-color;
+$popover-border-color: $gl-border-color-default;
 $popover-box-shadow: 0 $border-radius-small $gl-border-radius-base 0 $gl-color-alpha-dark-8;
 $popover-arrow-outer-color: $gl-color-alpha-dark-8;
 $h1-font-size: 14px * 2.5;
diff --git a/app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss b/app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss
index e2a7a4c2d1e..2094c5d9de7 100644
--- a/app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss
+++ b/app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss
@@ -71,7 +71,7 @@
 
     .diffOverview {
       background-color: $white;
-      border-left: 1px solid $border-color;
+      @apply gl-border-l;
       cursor: ns-resize;
     }
 
diff --git a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
index 2e1e888459f..b9627cc82ba 100644
--- a/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
+++ b/app/assets/stylesheets/page_bundles/_ide_theme_overrides.scss
@@ -106,7 +106,7 @@
   }
 
   .common-note-form .md-area {
-    border-color: var(--ide-input-border, $border-color);
+    border-color: var(--ide-input-border, var(--gl-border-color-default));
   }
 
   .md table:not(.code) tr th {
@@ -123,7 +123,7 @@
   .card-header,
   .ide-terminal .top-bar,
   .ide-pipeline .top-bar {
-    border-color: var(--ide-border-color, $border-color);
+    border-color: var(--ide-border-color, var(--gl-border-color-default));
   }
 
   hr {
@@ -138,7 +138,7 @@
   .nav-links,
   .gl-tabs-nav,
   .common-note-form .md-area.is-focused .nav-links {
-    border-color: var(--ide-border-color-alt, $border-color);
+    border-color: var(--ide-border-color-alt, var(--gl-border-color-default));
   }
 
   pre {
@@ -188,7 +188,7 @@
   input[type='text'],
   input[type='search'],
   .filtered-search-box {
-    border-color: var(--ide-input-border, $border-color);
+    border-color: var(--ide-input-border, var(--gl-border-color-default));
     background: var(--ide-input-background, $white) !important;
   }
 
@@ -241,7 +241,7 @@
   .dropdown,
   .dropdown-menu-toggle {
     color: var(--ide-input-color, var(--gl-text-color-default)) !important;
-    border-color: var(--ide-btn-default-border, $border-color);
+    border-color: var(--ide-btn-default-border, var(--gl-border-color-default));
   }
 
   .dropdown-menu-toggle {
@@ -258,34 +258,34 @@
   // todo: remove this block after all default buttons have been migrated to gl-button
   .btn-default:not(.gl-button) {
     background-color: var(--ide-btn-default-background, $white) !important;
-    border-color: var(--ide-btn-default-border, $border-color);
+    border-color: var(--ide-btn-default-border, var(--gl-border-color-default));
 
     &:hover,
     &:focus {
-      border-color: var(--ide-btn-default-hover-border, $border-color) !important;
+      border-color: var(--ide-btn-default-hover-border, var(--gl-border-color-default)) !important;
       background-color: var(--ide-btn-default-background, $gray-50) !important;
     }
 
     &:active,
     .active {
-      border-color: var(--ide-btn-default-hover-border, $border-color) !important;
-      background-color: var(--ide-btn-default-background, $border-color) !important;
+      border-color: var(--ide-btn-default-hover-border, var(--gl-border-color-default)) !important;
+      background-color: var(--ide-btn-default-background, var(--gl-border-color-default)) !important;
     }
   }
 
   .dropdown-menu {
     color: var(--ide-text-color, var(--gl-text-color-default));
-    border-color: var(--ide-background, $border-color);
+    border-color: var(--ide-background, var(--gl-border-color-default));
     background-color: var(--ide-dropdown-background, $white);
 
     .nav-links {
       background-color: var(--ide-dropdown-hover-background, $white);
-      border-color: var(--ide-dropdown-hover-background, $border-color);
+      border-color: var(--ide-dropdown-hover-background, var(--gl-border-color-default));
     }
 
     .gl-tabs-nav {
       background-color: var(--ide-dropdown-hover-background, $white);
-      box-shadow: inset 0 -2px 0 0 var(--ide-dropdown-hover-background, $border-color);
+      box-shadow: inset 0 -2px 0 0 var(--ide-dropdown-hover-background, var(--gl-border-color-default));
     }
 
     .divider {
diff --git a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
index 0cdc5ce210b..52b77dea57a 100644
--- a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
+++ b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss
@@ -1,18 +1,3 @@
-@mixin build-content($border-radius: 30px) {
-  display: inline-block;
-  padding: 8px 10px 9px;
-  width: 100%;
-  border: 1px solid var(--gl-border-color-default);
-  border-radius: $border-radius;
-  background-color: var(--white, $white);
-
-  &:hover {
-    background-color: var(--gray-50, $gray-50);
-    border: 1px solid $dropdown-toggle-active-border-color;
-    color: var(--gl-text-color-default);
-  }
-}
-
 /**
  Action icons inside dropdowns:
  - dropdown in big graph
diff --git a/app/assets/stylesheets/page_bundles/build.scss b/app/assets/stylesheets/page_bundles/build.scss
index e3c632bbf23..047614e3577 100644
--- a/app/assets/stylesheets/page_bundles/build.scss
+++ b/app/assets/stylesheets/page_bundles/build.scss
@@ -221,7 +221,7 @@
   align-items: flex-start;
 
   &:hover {
-    background-color: rgba($white, 0.2);
+    background-color: var(--gl-color-alpha-light-8);
   }
 
   .arrow {
@@ -229,6 +229,29 @@
   }
 }
 
+.job-log-line-highlight {
+  $highlight-border-size: 2px;
+  $highlight-extra-x-padding: 2px;
+  $highlight-x-padding: $gl-padding-8 + $highlight-extra-x-padding;
+  $highlight-border: $highlight-border-size solid currentColor;
+  $highlight-x-margin: -#{$highlight-border-size + $highlight-extra-x-padding};
+
+  border-left: $highlight-border;
+  border-right: $highlight-border;
+
+  padding-left: $highlight-x-padding;
+  padding-right: $highlight-x-padding;
+
+  margin-left: $highlight-x-margin;
+  margin-right: $highlight-x-margin;
+
+  background-color: var(--gl-color-alpha-light-4);
+
+  .arrow {
+    left: $highlight-extra-x-padding;
+  }
+}
+
 .loader-animation {
   @include build-loader-animation;
 }
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index 44a703c988b..e637d7a9212 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -64,15 +64,15 @@ $ide-commit-header-height: 48px;
   display: flex;
   flex-direction: column;
   flex: 1;
-  border-left: 1px solid var(--ide-border-color, $border-color);
-  border-right: 1px solid var(--ide-border-color, $border-color);
+  border-left: 1px solid var(--ide-border-color, var(--gl-border-color-default));
+  border-right: 1px solid var(--ide-border-color, var(--gl-border-color-default));
   overflow: hidden;
 }
 
 .multi-file-tabs {
   display: flex;
   background-color: var(--ide-background, $gray-10);
-  box-shadow: inset 0 -1px var(--ide-border-color, $border-color);
+  box-shadow: inset 0 -1px var(--ide-border-color, var(--gl-border-color-default));
 
   > ul {
     display: flex;
@@ -84,8 +84,8 @@ $ide-commit-header-height: 48px;
     align-items: center;
     padding: $grid-size $gl-padding;
     background-color: var(--ide-background-hover, $gray-50);
-    border-right: 1px solid var(--ide-border-color, $border-color);
-    border-bottom: 1px solid var(--ide-border-color, $border-color);
+    border-right: 1px solid var(--ide-border-color, var(--gl-border-color-default));
+    border-bottom: 1px solid var(--ide-border-color, var(--gl-border-color-default));
 
     // stylelint-disable-next-line gitlab/no-gl-class
     &.active,
@@ -129,13 +129,13 @@ $ide-commit-header-height: 48px;
         font-weight: normal !important;
 
         background-color: var(--ide-background-hover, $gray-50);
-        border-right: 1px solid var(--ide-border-color, $border-color);
-        border-bottom: 1px solid var(--ide-border-color, $border-color);
+        border-right: 1px solid var(--ide-border-color, var(--gl-border-color-default));
+        border-bottom: 1px solid var(--ide-border-color, var(--gl-border-color-default));
 
         // stylelint-disable-next-line gitlab/no-gl-class
         &.gl-tab-nav-item-active {
           background-color: var(--ide-highlight-background, $white);
-          border-color: var(--ide-border-color, $border-color);
+          border-color: var(--ide-border-color, var(--gl-border-color-default));
           border-bottom-color: transparent;
         }
 
@@ -233,7 +233,7 @@ $ide-commit-header-height: 48px;
 
 .ide-status-bar {
   color: var(--ide-text-color, var(--gl-text-color-default));
-  border-top: 1px solid var(--ide-border-color, $border-color);
+  border-top: 1px solid var(--ide-border-color, var(--gl-border-color-default));
   padding: 2px $gl-padding-8 0;
   background-color: var(--ide-footer-background, $white);
   display: flex;
@@ -307,8 +307,8 @@ $ide-commit-header-height: 48px;
     flex: 1;
     flex-direction: column;
     background-color: var(--ide-highlight-background, $white);
-    border-left: 1px solid var(--ide-border-color, $border-color);
-    border-top: 1px solid var(--ide-border-color, $border-color);
+    border-left: 1px solid var(--ide-border-color, var(--gl-border-color-default));
+    border-top: 1px solid var(--ide-border-color, var(--gl-border-color-default));
     border-top-left-radius: $border-radius-small;
     min-height: 0; // firefox fix
   }
@@ -333,7 +333,7 @@ $ide-commit-header-height: 48px;
 
 .multi-file-commit-panel-header {
   height: $ide-commit-header-height;
-  border-bottom: 1px solid var(--ide-border-color-alt, $border-color);
+  border-bottom: 1px solid var(--ide-border-color-alt, var(--gl-border-color-default));
   padding: 12px 0;
 }
 
@@ -395,7 +395,7 @@ $ide-commit-header-height: 48px;
 .multi-file-commit-form {
   position: relative;
   background-color: var(--ide-highlight-background, $white);
-  border-left: 1px solid var(--ide-border-color, $border-color);
+  border-left: 1px solid var(--ide-border-color, var(--gl-border-color-default));
   transition: all 0.3s ease;
 
   > form,
@@ -403,7 +403,7 @@ $ide-commit-header-height: 48px;
     padding: $gl-padding 0;
     margin-left: $gl-padding;
     margin-right: $gl-padding;
-    border-top: 1px solid var(--ide-border-color-alt, $border-color);
+    border-top: 1px solid var(--ide-border-color-alt, var(--gl-border-color-default));
   }
 
   .btn {
@@ -474,7 +474,7 @@ $ide-commit-header-height: 48px;
   margin-right: $gl-padding;
 
   &.is-first {
-    border-bottom: 1px solid var(--ide-border-color-alt, $border-color);
+    border-bottom: 1px solid var(--ide-border-color-alt, var(--gl-border-color-default));
   }
 }
 
@@ -527,8 +527,8 @@ $ide-commit-header-height: 48px;
     width: calc(100% + 1px);
     padding-right: $gl-padding + 1px;
     background-color: var(--ide-highlight-background, $white);
-    border-top-color: var(--ide-border-color, $border-color);
-    border-bottom-color: var(--ide-border-color, $border-color);
+    border-top-color: var(--ide-border-color, var(--gl-border-color-default));
+    border-bottom-color: var(--ide-border-color, var(--gl-border-color-default));
 
     &::after {
       content: '';
@@ -639,7 +639,7 @@ $ide-commit-header-height: 48px;
   padding: 12px 0;
   margin-left: $ide-tree-padding;
   margin-right: $ide-tree-padding;
-  border-bottom: 1px solid var(--ide-border-color-alt, $border-color);
+  border-bottom: 1px solid var(--ide-border-color-alt, var(--gl-border-color-default));
 
   svg {
     color: var(--ide-text-color-secondary, var(--gl-icon-color-subtle));
@@ -853,7 +853,7 @@ $ide-commit-header-height: 48px;
   padding: 16px;
 
   &:not(:last-child) {
-    border-bottom: 1px solid var(--ide-border-color, $border-color);
+    border-bottom: 1px solid var(--ide-border-color, var(--gl-border-color-default));
   }
 
   .ci-status-icon {
@@ -983,7 +983,7 @@ $ide-commit-header-height: 48px;
 .ide-file-templates {
   padding: $grid-size $gl-padding;
   background-color: var(--ide-background, $gray-10);
-  border-bottom: 1px solid var(--ide-border-color, $border-color);
+  border-bottom: 1px solid var(--ide-border-color, var(--gl-border-color-default));
 
   .dropdown {
     min-width: 180px;
@@ -998,7 +998,7 @@ $ide-commit-header-height: 48px;
   height: 65px;
   padding: 8px 16px;
   background-color: var(--ide-background, $gray-10);
-  box-shadow: inset 0 -1px var(--ide-border-color, $border-color);
+  box-shadow: inset 0 -1px var(--ide-border-color, var(--gl-border-color-default));
 }
 
 .ide-commit-list-changed-icon {
diff --git a/app/assets/stylesheets/page_bundles/incidents.scss b/app/assets/stylesheets/page_bundles/incidents.scss
index 633648ba18d..2cd0ec6da45 100644
--- a/app/assets/stylesheets/page_bundles/incidents.scss
+++ b/app/assets/stylesheets/page_bundles/incidents.scss
@@ -102,7 +102,7 @@
   .timeline-entry:last-child,
   .create-timeline-event {
     .timeline-event-bottom-border {
-      border-bottom: solid $gl-border-size-1 $border-color;
+      @apply gl-border-b;
       padding-top: $gl-spacing-scale-5;
     }
   }
diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss
index 54857f71312..c83baa5f4dc 100644
--- a/app/assets/stylesheets/page_bundles/milestone.scss
+++ b/app/assets/stylesheets/page_bundles/milestone.scss
@@ -86,7 +86,7 @@
     }
 
     .reference {
-      border-top: 1px solid $border-color;
+      @apply gl-border-t;
     }
   }
 }
diff --git a/app/assets/stylesheets/page_bundles/profiles/preferences.scss b/app/assets/stylesheets/page_bundles/profiles/preferences.scss
index 4369474a410..713033bb315 100644
--- a/app/assets/stylesheets/page_bundles/profiles/preferences.scss
+++ b/app/assets/stylesheets/page_bundles/profiles/preferences.scss
@@ -42,7 +42,7 @@
 
     &.ui-gray {
       background-color: $gray-900;
-      border: solid 1px $border-color;
+      @apply gl-border;
     }
 
     &.ui-neutral {
@@ -51,7 +51,7 @@
       // stylelint-disable-next-line gitlab/no-gl-class
       .gl-dark & {
         background-color: $gray-950;
-        border: solid 1px $border-color;
+        @apply gl-border;
       }
     }
   }
diff --git a/app/assets/stylesheets/snippets.scss b/app/assets/stylesheets/snippets.scss
index 6b2c9e64484..f4884f0ffb6 100644
--- a/app/assets/stylesheets/snippets.scss
+++ b/app/assets/stylesheets/snippets.scss
@@ -4,7 +4,7 @@
   @import 'highlight/embedded';
   @import 'framework/images';
 
-  $border-style: 1px solid $border-color;
+  $border-style: 1px solid $gl-border-color-default;
 
   font-family: $regular-font;
   font-size: $gl-font-size;
diff --git a/config/feature_flags/wip/populate_and_use_build_source_table.yml b/config/feature_flags/beta/populate_and_use_build_source_table.yml
similarity index 76%
rename from config/feature_flags/wip/populate_and_use_build_source_table.yml
rename to config/feature_flags/beta/populate_and_use_build_source_table.yml
index 9fa2410b9c9..1883ee0bdca 100644
--- a/config/feature_flags/wip/populate_and_use_build_source_table.yml
+++ b/config/feature_flags/beta/populate_and_use_build_source_table.yml
@@ -2,8 +2,8 @@
 name: populate_and_use_build_source_table
 feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/11796
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170899
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/517040
 milestone: '17.7'
 group: group::security policies
-type: wip
+type: beta
 default_enabled: false
diff --git a/data/deprecations/17-7-deprecate-SPPgraphqlmutation.yml b/data/deprecations/17-7-deprecate-SPPgraphqlmutation.yml
index 9f3e66322b3..56827f17e0d 100644
--- a/data/deprecations/17-7-deprecate-SPPgraphqlmutation.yml
+++ b/data/deprecations/17-7-deprecate-SPPgraphqlmutation.yml
@@ -1,14 +1,20 @@
-- title: "Rename 'setPreReceiveSecretDetection' GraphQL mutation to 'setSecretPushProtection'"
+- title: "Rename `setPreReceiveSecretDetection` GraphQL mutation to `setSecretPushProtection`"
   removal_milestone: "18.0"
   announcement_milestone: "17.7"
   breaking_change: true
-  window: 1
-  reporter: smeadzinger
+  window: 3
+  reporter: abellucci
   stage: application_security_testing
-  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462504
-  impact: low
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514414
+  impact: medium
   scope: project
   resolution_role: Maintainer
   manual_task: true
   body: |
-    The 'setPreReceiveSecretDetection' GraphQL mutation has been renamed to 'setSecretPushProtection'.
+    The `setPreReceiveSecretDetection` GraphQL mutation has been renamed to `setSecretPushProtection`. We are also renaming some fields in the mutation's response to reflect the name change of the feature `pre_receive_secret_detection` to `secret_push_protection`.
+    To avoid breaking workflows that use the old name, before GitLab 18.0 you should:
+
+    - Stop using the old mutation name `setPreReceiveSecretDetection`. Instead, use the name `setSecretPushProtection`.
+    - Change any references to the field `pre_receive_secret_detection_enabled` to `secret_push_protection_enabled`.
+
+  documentation_url: https://docs.gitlab.com/ee/api/graphql/reference/index.html#mutationsetsecretpushprotection
diff --git a/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_group_id.yml b/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_group_id.yml
new file mode 100644
index 00000000000..c61c96ea7f1
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_group_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillBulkImportExportBatchesGroupId
+description: Backfills sharding key `bulk_import_export_batches.group_id` from `bulk_import_exports`.
+feature_category: importers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180432
+milestone: '17.9'
+queued_migration_version: 20250205194220
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_project_id.yml b/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_project_id.yml
new file mode 100644
index 00000000000..dc1671cc398
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_bulk_import_export_batches_project_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillBulkImportExportBatchesProjectId
+description: Backfills sharding key `bulk_import_export_batches.project_id` from `bulk_import_exports`.
+feature_category: importers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180432
+milestone: '17.9'
+queued_migration_version: 20250205194215
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_compliance_violation_null_target_project_ids.yml b/db/docs/batched_background_migrations/backfill_compliance_violation_null_target_project_ids.yml
index c12a804535d..3c6b77e76a9 100644
--- a/db/docs/batched_background_migrations/backfill_compliance_violation_null_target_project_ids.yml
+++ b/db/docs/batched_background_migrations/backfill_compliance_violation_null_target_project_ids.yml
@@ -1,8 +1,8 @@
 ---
 migration_job_name: BackfillComplianceViolationNullTargetProjectIds
-description: Backfill target_project_id for ComplianceViolation models so we can set NOT NULL to the column in the future
+description: Backfill target_project_id for ComplianceViolation models so we can validate the FK
 feature_category: compliance_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172754
-milestone: '17.7'
-queued_migration_version: 20241114202257
-finalized_by: 20250106194913
+milestone: '17.9'
+queued_migration_version: 20250203155647
+finalized_by:
diff --git a/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_namespace_id.yml b/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_namespace_id.yml
new file mode 100644
index 00000000000..9112d9eb301
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_namespace_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId
+description: Backfills sharding key `required_code_owners_sections.protected_branch_namespace_id` from `protected_branches`.
+feature_category: source_code_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180440
+milestone: '17.9'
+queued_migration_version: 20250205200247
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_project_id.yml b/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_project_id.yml
new file mode 100644
index 00000000000..aac903af0df
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_required_code_owners_sections_protected_branch_project_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillRequiredCodeOwnersSectionsProtectedBranchProjectId
+description: Backfills sharding key `required_code_owners_sections.protected_branch_project_id` from `protected_branches`.
+feature_category: source_code_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180440
+milestone: '17.9'
+queued_migration_version: 20250205200242
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_organization_id.yml b/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_organization_id.yml
new file mode 100644
index 00000000000..2f200044cf3
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_organization_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillSnippetRepositoryStorageMovesSnippetOrganizationId
+description: Backfills sharding key `snippet_repository_storage_moves.snippet_organization_id` from `snippets`.
+feature_category: source_code_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180441
+milestone: '17.9'
+queued_migration_version: 20250205200748
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_project_id.yml b/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_project_id.yml
new file mode 100644
index 00000000000..aaf36168529
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_snippet_repository_storage_moves_snippet_project_id.yml
@@ -0,0 +1,8 @@
+---
+migration_job_name: BackfillSnippetRepositoryStorageMovesSnippetProjectId
+description: Backfills sharding key `snippet_repository_storage_moves.snippet_project_id` from `snippets`.
+feature_category: source_code_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180441
+milestone: '17.9'
+queued_migration_version: 20250205200743
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/bulk_import_export_batches.yml b/db/docs/bulk_import_export_batches.yml
index f1daad66971..e006449d94d 100644
--- a/db/docs/bulk_import_export_batches.yml
+++ b/db/docs/bulk_import_export_batches.yml
@@ -27,3 +27,6 @@ desired_sharding_key:
         table: bulk_import_exports
         sharding_key: group_id
         belongs_to: export
+desired_sharding_key_migration_job_name:
+- BackfillBulkImportExportBatchesProjectId
+- BackfillBulkImportExportBatchesGroupId
diff --git a/db/docs/required_code_owners_sections.yml b/db/docs/required_code_owners_sections.yml
index 88ffd8b9c6a..77cf1cef430 100644
--- a/db/docs/required_code_owners_sections.yml
+++ b/db/docs/required_code_owners_sections.yml
@@ -26,3 +26,6 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: protected_branch
 table_size: small
+desired_sharding_key_migration_job_name:
+- BackfillRequiredCodeOwnersSectionsProtectedBranchProjectId
+- BackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId
diff --git a/db/docs/snippet_repository_storage_moves.yml b/db/docs/snippet_repository_storage_moves.yml
index d9712fa949e..23ad7b7db8d 100644
--- a/db/docs/snippet_repository_storage_moves.yml
+++ b/db/docs/snippet_repository_storage_moves.yml
@@ -28,3 +28,6 @@ desired_sharding_key:
         table: snippets
         sharding_key: organization_id
         belongs_to: container
+desired_sharding_key_migration_job_name:
+- BackfillSnippetRepositoryStorageMovesSnippetProjectId
+- BackfillSnippetRepositoryStorageMovesSnippetOrganizationId
diff --git a/db/migrate/20250205194211_add_project_id_to_bulk_import_export_batches.rb b/db/migrate/20250205194211_add_project_id_to_bulk_import_export_batches.rb
new file mode 100644
index 00000000000..8599141d797
--- /dev/null
+++ b/db/migrate/20250205194211_add_project_id_to_bulk_import_export_batches.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToBulkImportExportBatches < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :bulk_import_export_batches, :project_id, :bigint
+  end
+end
diff --git a/db/migrate/20250205194216_add_group_id_to_bulk_import_export_batches.rb b/db/migrate/20250205194216_add_group_id_to_bulk_import_export_batches.rb
new file mode 100644
index 00000000000..6a36a62c384
--- /dev/null
+++ b/db/migrate/20250205194216_add_group_id_to_bulk_import_export_batches.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddGroupIdToBulkImportExportBatches < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :bulk_import_export_batches, :group_id, :bigint
+  end
+end
diff --git a/db/migrate/20250205200238_add_protected_branch_project_id_to_required_code_owners_sections.rb b/db/migrate/20250205200238_add_protected_branch_project_id_to_required_code_owners_sections.rb
new file mode 100644
index 00000000000..7f8938c4aec
--- /dev/null
+++ b/db/migrate/20250205200238_add_protected_branch_project_id_to_required_code_owners_sections.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProtectedBranchProjectIdToRequiredCodeOwnersSections < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :required_code_owners_sections, :protected_branch_project_id, :bigint
+  end
+end
diff --git a/db/migrate/20250205200243_add_protected_branch_namespace_id_to_required_code_owners_sections.rb b/db/migrate/20250205200243_add_protected_branch_namespace_id_to_required_code_owners_sections.rb
new file mode 100644
index 00000000000..195110bb67f
--- /dev/null
+++ b/db/migrate/20250205200243_add_protected_branch_namespace_id_to_required_code_owners_sections.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProtectedBranchNamespaceIdToRequiredCodeOwnersSections < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :required_code_owners_sections, :protected_branch_namespace_id, :bigint
+  end
+end
diff --git a/db/migrate/20250205200739_add_snippet_project_id_to_snippet_repository_storage_moves.rb b/db/migrate/20250205200739_add_snippet_project_id_to_snippet_repository_storage_moves.rb
new file mode 100644
index 00000000000..6b16d3fb7f5
--- /dev/null
+++ b/db/migrate/20250205200739_add_snippet_project_id_to_snippet_repository_storage_moves.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSnippetProjectIdToSnippetRepositoryStorageMoves < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :snippet_repository_storage_moves, :snippet_project_id, :bigint
+  end
+end
diff --git a/db/migrate/20250205200744_add_snippet_organization_id_to_snippet_repository_storage_moves.rb b/db/migrate/20250205200744_add_snippet_organization_id_to_snippet_repository_storage_moves.rb
new file mode 100644
index 00000000000..3eb59dbf932
--- /dev/null
+++ b/db/migrate/20250205200744_add_snippet_organization_id_to_snippet_repository_storage_moves.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSnippetOrganizationIdToSnippetRepositoryStorageMoves < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def change
+    add_column :snippet_repository_storage_moves, :snippet_organization_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb b/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
index 3462607aef0..1c7539afbc4 100644
--- a/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
+++ b/db/post_migrate/20241114202257_queue_backfill_compliance_violation_null_target_project_ids.rb
@@ -5,23 +5,13 @@ class QueueBackfillComplianceViolationNullTargetProjectIds < Gitlab::Database::M
 
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
-  MIGRATION = "BackfillComplianceViolationNullTargetProjectIds"
-  DELAY_INTERVAL = 2.minutes
-  BATCH_SIZE = 1000
-  SUB_BATCH_SIZE = 100
-
   def up
-    queue_batched_background_migration(
-      MIGRATION,
-      :merge_requests_compliance_violations,
-      :id,
-      job_interval: DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
+    # no-op
+    # Requeued by https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180053
   end
 
   def down
-    delete_batched_background_migration(MIGRATION, :merge_requests_compliance_violations, :id, [])
+    # noop
+    # Requeued by https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180053
   end
 end
diff --git a/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb b/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb
new file mode 100644
index 00000000000..3479af1bc2c
--- /dev/null
+++ b/db/post_migrate/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class RequeueBackfillComplianceViolationNullTargetProjectIdsMigration < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = "BackfillComplianceViolationNullTargetProjectIds"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 10_000
+  SUB_BATCH_SIZE = 1_000
+
+  def up
+    delete_batched_background_migration(MIGRATION, :merge_requests_compliance_violations, :id, [])
+
+    queue_batched_background_migration(
+      MIGRATION,
+      :merge_requests_compliance_violations,
+      :id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :merge_requests_compliance_violations, :id, [])
+  end
+end
diff --git a/db/post_migrate/20250205194212_index_bulk_import_export_batches_on_project_id.rb b/db/post_migrate/20250205194212_index_bulk_import_export_batches_on_project_id.rb
new file mode 100644
index 00000000000..08989e7529d
--- /dev/null
+++ b/db/post_migrate/20250205194212_index_bulk_import_export_batches_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexBulkImportExportBatchesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_bulk_import_export_batches_on_project_id'
+
+  def up
+    add_concurrent_index :bulk_import_export_batches, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :bulk_import_export_batches, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205194213_add_bulk_import_export_batches_project_id_fk.rb b/db/post_migrate/20250205194213_add_bulk_import_export_batches_project_id_fk.rb
new file mode 100644
index 00000000000..3c9ac755b34
--- /dev/null
+++ b/db/post_migrate/20250205194213_add_bulk_import_export_batches_project_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportBatchesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :bulk_import_export_batches, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :bulk_import_export_batches, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205194214_add_bulk_import_export_batches_project_id_trigger.rb b/db/post_migrate/20250205194214_add_bulk_import_export_batches_project_id_trigger.rb
new file mode 100644
index 00000000000..4993a455578
--- /dev/null
+++ b/db/post_migrate/20250205194214_add_bulk_import_export_batches_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportBatchesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :bulk_import_export_batches,
+      sharding_key: :project_id,
+      parent_table: :bulk_import_exports,
+      parent_sharding_key: :project_id,
+      foreign_key: :export_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :bulk_import_export_batches,
+      sharding_key: :project_id,
+      parent_table: :bulk_import_exports,
+      parent_sharding_key: :project_id,
+      foreign_key: :export_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205194215_queue_backfill_bulk_import_export_batches_project_id.rb b/db/post_migrate/20250205194215_queue_backfill_bulk_import_export_batches_project_id.rb
new file mode 100644
index 00000000000..0b4faaf69cf
--- /dev/null
+++ b/db/post_migrate/20250205194215_queue_backfill_bulk_import_export_batches_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillBulkImportExportBatchesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillBulkImportExportBatchesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :bulk_import_export_batches,
+      :id,
+      :project_id,
+      :bulk_import_exports,
+      :project_id,
+      :export_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :bulk_import_export_batches,
+      :id,
+      [
+        :project_id,
+        :bulk_import_exports,
+        :project_id,
+        :export_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20250205194217_index_bulk_import_export_batches_on_group_id.rb b/db/post_migrate/20250205194217_index_bulk_import_export_batches_on_group_id.rb
new file mode 100644
index 00000000000..6ab05dfa4f3
--- /dev/null
+++ b/db/post_migrate/20250205194217_index_bulk_import_export_batches_on_group_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexBulkImportExportBatchesOnGroupId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_bulk_import_export_batches_on_group_id'
+
+  def up
+    add_concurrent_index :bulk_import_export_batches, :group_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :bulk_import_export_batches, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205194218_add_bulk_import_export_batches_group_id_fk.rb b/db/post_migrate/20250205194218_add_bulk_import_export_batches_group_id_fk.rb
new file mode 100644
index 00000000000..e3f83c54073
--- /dev/null
+++ b/db/post_migrate/20250205194218_add_bulk_import_export_batches_group_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportBatchesGroupIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :bulk_import_export_batches, :namespaces, column: :group_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :bulk_import_export_batches, column: :group_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205194219_add_bulk_import_export_batches_group_id_trigger.rb b/db/post_migrate/20250205194219_add_bulk_import_export_batches_group_id_trigger.rb
new file mode 100644
index 00000000000..dfa4b4f6f79
--- /dev/null
+++ b/db/post_migrate/20250205194219_add_bulk_import_export_batches_group_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportBatchesGroupIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :bulk_import_export_batches,
+      sharding_key: :group_id,
+      parent_table: :bulk_import_exports,
+      parent_sharding_key: :group_id,
+      foreign_key: :export_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :bulk_import_export_batches,
+      sharding_key: :group_id,
+      parent_table: :bulk_import_exports,
+      parent_sharding_key: :group_id,
+      foreign_key: :export_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205194220_queue_backfill_bulk_import_export_batches_group_id.rb b/db/post_migrate/20250205194220_queue_backfill_bulk_import_export_batches_group_id.rb
new file mode 100644
index 00000000000..cb6629bf079
--- /dev/null
+++ b/db/post_migrate/20250205194220_queue_backfill_bulk_import_export_batches_group_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillBulkImportExportBatchesGroupId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillBulkImportExportBatchesGroupId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :bulk_import_export_batches,
+      :id,
+      :group_id,
+      :bulk_import_exports,
+      :group_id,
+      :export_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :bulk_import_export_batches,
+      :id,
+      [
+        :group_id,
+        :bulk_import_exports,
+        :group_id,
+        :export_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200239_index_required_code_owners_sections_on_protected_branch_project_id.rb b/db/post_migrate/20250205200239_index_required_code_owners_sections_on_protected_branch_project_id.rb
new file mode 100644
index 00000000000..c9d1abc582d
--- /dev/null
+++ b/db/post_migrate/20250205200239_index_required_code_owners_sections_on_protected_branch_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexRequiredCodeOwnersSectionsOnProtectedBranchProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_required_code_owners_sections_on_protected_branch_project'
+
+  def up
+    add_concurrent_index :required_code_owners_sections, :protected_branch_project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :required_code_owners_sections, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205200240_add_required_code_owners_sections_protected_branch_project_id_fk.rb b/db/post_migrate/20250205200240_add_required_code_owners_sections_protected_branch_project_id_fk.rb
new file mode 100644
index 00000000000..4bba51fc1a0
--- /dev/null
+++ b/db/post_migrate/20250205200240_add_required_code_owners_sections_protected_branch_project_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddRequiredCodeOwnersSectionsProtectedBranchProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :required_code_owners_sections, :projects, column: :protected_branch_project_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :required_code_owners_sections, column: :protected_branch_project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205200241_add_required_code_owners_sections_protected_branch_project_id_trigger.rb b/db/post_migrate/20250205200241_add_required_code_owners_sections_protected_branch_project_id_trigger.rb
new file mode 100644
index 00000000000..e3d73c4c5f2
--- /dev/null
+++ b/db/post_migrate/20250205200241_add_required_code_owners_sections_protected_branch_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddRequiredCodeOwnersSectionsProtectedBranchProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :required_code_owners_sections,
+      sharding_key: :protected_branch_project_id,
+      parent_table: :protected_branches,
+      parent_sharding_key: :project_id,
+      foreign_key: :protected_branch_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :required_code_owners_sections,
+      sharding_key: :protected_branch_project_id,
+      parent_table: :protected_branches,
+      parent_sharding_key: :project_id,
+      foreign_key: :protected_branch_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id.rb b/db/post_migrate/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id.rb
new file mode 100644
index 00000000000..53d9dd99368
--- /dev/null
+++ b/db/post_migrate/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillRequiredCodeOwnersSectionsProtectedBranchProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillRequiredCodeOwnersSectionsProtectedBranchProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :required_code_owners_sections,
+      :id,
+      :protected_branch_project_id,
+      :protected_branches,
+      :project_id,
+      :protected_branch_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :required_code_owners_sections,
+      :id,
+      [
+        :protected_branch_project_id,
+        :protected_branches,
+        :project_id,
+        :protected_branch_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200244_index_required_code_owners_sections_on_protected_branch_namespace_id.rb b/db/post_migrate/20250205200244_index_required_code_owners_sections_on_protected_branch_namespace_id.rb
new file mode 100644
index 00000000000..273c34279d1
--- /dev/null
+++ b/db/post_migrate/20250205200244_index_required_code_owners_sections_on_protected_branch_namespace_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexRequiredCodeOwnersSectionsOnProtectedBranchNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_required_code_owners_sections_on_protected_branch_namespa'
+
+  def up
+    add_concurrent_index :required_code_owners_sections, :protected_branch_namespace_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :required_code_owners_sections, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205200245_add_required_code_owners_sections_protected_branch_namespace_id_fk.rb b/db/post_migrate/20250205200245_add_required_code_owners_sections_protected_branch_namespace_id_fk.rb
new file mode 100644
index 00000000000..4cdcefff15b
--- /dev/null
+++ b/db/post_migrate/20250205200245_add_required_code_owners_sections_protected_branch_namespace_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddRequiredCodeOwnersSectionsProtectedBranchNamespaceIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :required_code_owners_sections, :namespaces, column: :protected_branch_namespace_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :required_code_owners_sections, column: :protected_branch_namespace_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205200246_add_required_code_owners_sections_protected_branch_namespace_id_trigger.rb b/db/post_migrate/20250205200246_add_required_code_owners_sections_protected_branch_namespace_id_trigger.rb
new file mode 100644
index 00000000000..c3c09ef1172
--- /dev/null
+++ b/db/post_migrate/20250205200246_add_required_code_owners_sections_protected_branch_namespace_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddRequiredCodeOwnersSectionsProtectedBranchNamespaceIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :required_code_owners_sections,
+      sharding_key: :protected_branch_namespace_id,
+      parent_table: :protected_branches,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :protected_branch_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :required_code_owners_sections,
+      sharding_key: :protected_branch_namespace_id,
+      parent_table: :protected_branches,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :protected_branch_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id.rb b/db/post_migrate/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id.rb
new file mode 100644
index 00000000000..255d9b27dbe
--- /dev/null
+++ b/db/post_migrate/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :required_code_owners_sections,
+      :id,
+      :protected_branch_namespace_id,
+      :protected_branches,
+      :namespace_id,
+      :protected_branch_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :required_code_owners_sections,
+      :id,
+      [
+        :protected_branch_namespace_id,
+        :protected_branches,
+        :namespace_id,
+        :protected_branch_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200740_index_snippet_repository_storage_moves_on_snippet_project_id.rb b/db/post_migrate/20250205200740_index_snippet_repository_storage_moves_on_snippet_project_id.rb
new file mode 100644
index 00000000000..52209adee7c
--- /dev/null
+++ b/db/post_migrate/20250205200740_index_snippet_repository_storage_moves_on_snippet_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexSnippetRepositoryStorageMovesOnSnippetProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_snippet_repository_storage_moves_on_snippet_project_id'
+
+  def up
+    add_concurrent_index :snippet_repository_storage_moves, :snippet_project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :snippet_repository_storage_moves, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205200741_add_snippet_repository_storage_moves_snippet_project_id_fk.rb b/db/post_migrate/20250205200741_add_snippet_repository_storage_moves_snippet_project_id_fk.rb
new file mode 100644
index 00000000000..841e07497c5
--- /dev/null
+++ b/db/post_migrate/20250205200741_add_snippet_repository_storage_moves_snippet_project_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSnippetRepositoryStorageMovesSnippetProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :snippet_repository_storage_moves, :projects, column: :snippet_project_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :snippet_repository_storage_moves, column: :snippet_project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205200742_add_snippet_repository_storage_moves_snippet_project_id_trigger.rb b/db/post_migrate/20250205200742_add_snippet_repository_storage_moves_snippet_project_id_trigger.rb
new file mode 100644
index 00000000000..376814c461b
--- /dev/null
+++ b/db/post_migrate/20250205200742_add_snippet_repository_storage_moves_snippet_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddSnippetRepositoryStorageMovesSnippetProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :snippet_repository_storage_moves,
+      sharding_key: :snippet_project_id,
+      parent_table: :snippets,
+      parent_sharding_key: :project_id,
+      foreign_key: :snippet_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :snippet_repository_storage_moves,
+      sharding_key: :snippet_project_id,
+      parent_table: :snippets,
+      parent_sharding_key: :project_id,
+      foreign_key: :snippet_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id.rb b/db/post_migrate/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id.rb
new file mode 100644
index 00000000000..03f1f746602
--- /dev/null
+++ b/db/post_migrate/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillSnippetRepositoryStorageMovesSnippetProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillSnippetRepositoryStorageMovesSnippetProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :snippet_repository_storage_moves,
+      :id,
+      :snippet_project_id,
+      :snippets,
+      :project_id,
+      :snippet_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :snippet_repository_storage_moves,
+      :id,
+      [
+        :snippet_project_id,
+        :snippets,
+        :project_id,
+        :snippet_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200745_index_snippet_repository_storage_moves_on_snippet_organization_id.rb b/db/post_migrate/20250205200745_index_snippet_repository_storage_moves_on_snippet_organization_id.rb
new file mode 100644
index 00000000000..67085677b3e
--- /dev/null
+++ b/db/post_migrate/20250205200745_index_snippet_repository_storage_moves_on_snippet_organization_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexSnippetRepositoryStorageMovesOnSnippetOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_snippet_repository_storage_moves_on_snippet_organization_'
+
+  def up
+    add_concurrent_index :snippet_repository_storage_moves, :snippet_organization_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :snippet_repository_storage_moves, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250205200746_add_snippet_repository_storage_moves_snippet_organization_id_fk.rb b/db/post_migrate/20250205200746_add_snippet_repository_storage_moves_snippet_organization_id_fk.rb
new file mode 100644
index 00000000000..5272a8108b4
--- /dev/null
+++ b/db/post_migrate/20250205200746_add_snippet_repository_storage_moves_snippet_organization_id_fk.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSnippetRepositoryStorageMovesSnippetOrganizationIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :snippet_repository_storage_moves, :organizations, column: :snippet_organization_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :snippet_repository_storage_moves, column: :snippet_organization_id
+    end
+  end
+end
diff --git a/db/post_migrate/20250205200747_add_snippet_repository_storage_moves_snippet_organization_id_trigger.rb b/db/post_migrate/20250205200747_add_snippet_repository_storage_moves_snippet_organization_id_trigger.rb
new file mode 100644
index 00000000000..1d8e7a0f61c
--- /dev/null
+++ b/db/post_migrate/20250205200747_add_snippet_repository_storage_moves_snippet_organization_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddSnippetRepositoryStorageMovesSnippetOrganizationIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :snippet_repository_storage_moves,
+      sharding_key: :snippet_organization_id,
+      parent_table: :snippets,
+      parent_sharding_key: :organization_id,
+      foreign_key: :snippet_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :snippet_repository_storage_moves,
+      sharding_key: :snippet_organization_id,
+      parent_table: :snippets,
+      parent_sharding_key: :organization_id,
+      foreign_key: :snippet_id
+    )
+  end
+end
diff --git a/db/post_migrate/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id.rb b/db/post_migrate/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id.rb
new file mode 100644
index 00000000000..da10ca3ced0
--- /dev/null
+++ b/db/post_migrate/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillSnippetRepositoryStorageMovesSnippetOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.9'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillSnippetRepositoryStorageMovesSnippetOrganizationId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :snippet_repository_storage_moves,
+      :id,
+      :snippet_organization_id,
+      :snippets,
+      :organization_id,
+      :snippet_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :snippet_repository_storage_moves,
+      :id,
+      [
+        :snippet_organization_id,
+        :snippets,
+        :organization_id,
+        :snippet_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20250203155647 b/db/schema_migrations/20250203155647
new file mode 100644
index 00000000000..058274f2892
--- /dev/null
+++ b/db/schema_migrations/20250203155647
@@ -0,0 +1 @@
+69e62d835391a30864604e0f6e7606eee6be11dd9222b8f7a27a091c75f7a48b
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194211 b/db/schema_migrations/20250205194211
new file mode 100644
index 00000000000..77f7a4eda2e
--- /dev/null
+++ b/db/schema_migrations/20250205194211
@@ -0,0 +1 @@
+b34a3ed26d3334bdc540bbaf24b4f4ca1363e7b298d80563911ba22f70a49ea8
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194212 b/db/schema_migrations/20250205194212
new file mode 100644
index 00000000000..ce1e28ef37c
--- /dev/null
+++ b/db/schema_migrations/20250205194212
@@ -0,0 +1 @@
+f232c938acc1bc36de7026708242b3d0e37f9b790cf33e04c1aba48f95f1e78a
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194213 b/db/schema_migrations/20250205194213
new file mode 100644
index 00000000000..71e85f14987
--- /dev/null
+++ b/db/schema_migrations/20250205194213
@@ -0,0 +1 @@
+786144c2e8d07fa235bf42140c8f4c129428005bd1a40d9166d7164076c30069
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194214 b/db/schema_migrations/20250205194214
new file mode 100644
index 00000000000..aa0bd26dc71
--- /dev/null
+++ b/db/schema_migrations/20250205194214
@@ -0,0 +1 @@
+37bec5959dea60be93a4692ab77d6fc8386654936cb89bf1e41f25a9d8e4fe7d
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194215 b/db/schema_migrations/20250205194215
new file mode 100644
index 00000000000..1f9989c9dfc
--- /dev/null
+++ b/db/schema_migrations/20250205194215
@@ -0,0 +1 @@
+1fb52aeec6b0d8f6f6a3f4f93665fe6847276b64571cfefe8411d965e42f964c
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194216 b/db/schema_migrations/20250205194216
new file mode 100644
index 00000000000..9f01ccea9ed
--- /dev/null
+++ b/db/schema_migrations/20250205194216
@@ -0,0 +1 @@
+64c55754411150e58880a106b66fca024b764867af0165150afa7cc63f78c24c
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194217 b/db/schema_migrations/20250205194217
new file mode 100644
index 00000000000..979319b3d3d
--- /dev/null
+++ b/db/schema_migrations/20250205194217
@@ -0,0 +1 @@
+a0e3e2b19c8e56e7efca28f91d23e831b85681714524031898d56d1768a0bceb
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194218 b/db/schema_migrations/20250205194218
new file mode 100644
index 00000000000..bae7edc50b2
--- /dev/null
+++ b/db/schema_migrations/20250205194218
@@ -0,0 +1 @@
+cd90fce585b2c6c54653f400e473f831689e1809c143ea22c86df4e3cde85f19
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194219 b/db/schema_migrations/20250205194219
new file mode 100644
index 00000000000..1c3d6f8ea3b
--- /dev/null
+++ b/db/schema_migrations/20250205194219
@@ -0,0 +1 @@
+fdfe8d62bedf723dd12481e65cd789b084bc2758d35cd45337edb00aa4f8ed43
\ No newline at end of file
diff --git a/db/schema_migrations/20250205194220 b/db/schema_migrations/20250205194220
new file mode 100644
index 00000000000..e17c416fde0
--- /dev/null
+++ b/db/schema_migrations/20250205194220
@@ -0,0 +1 @@
+afba62ea5f560ea6930004960c18dda1ded59abde09d8c364c8950e87875e464
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200238 b/db/schema_migrations/20250205200238
new file mode 100644
index 00000000000..46095cfdd4f
--- /dev/null
+++ b/db/schema_migrations/20250205200238
@@ -0,0 +1 @@
+d30e03f5fe9261870d74212c20a1c88229c6aa1289445991ea7ed5aa1b4313cf
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200239 b/db/schema_migrations/20250205200239
new file mode 100644
index 00000000000..6a80ee71c63
--- /dev/null
+++ b/db/schema_migrations/20250205200239
@@ -0,0 +1 @@
+5037c2ad27f62fe904e9c927753dc314f41bcb1a39e239d1ba0cdfd58a5dca41
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200240 b/db/schema_migrations/20250205200240
new file mode 100644
index 00000000000..28008c920ac
--- /dev/null
+++ b/db/schema_migrations/20250205200240
@@ -0,0 +1 @@
+35edf919dd00fe7ca4b76e31faf6bc38c40367da3f97e75c65507c35742f3e19
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200241 b/db/schema_migrations/20250205200241
new file mode 100644
index 00000000000..752a3188d51
--- /dev/null
+++ b/db/schema_migrations/20250205200241
@@ -0,0 +1 @@
+fe2da4dbbed7e9ccf30d0822845315997edc9251245ca144bf908a1e20e9d194
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200242 b/db/schema_migrations/20250205200242
new file mode 100644
index 00000000000..fe18fb54958
--- /dev/null
+++ b/db/schema_migrations/20250205200242
@@ -0,0 +1 @@
+e6dfb7390678343b8fb10624f2ecf315442b585e1ccab16928b7b0b2b5bd35d1
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200243 b/db/schema_migrations/20250205200243
new file mode 100644
index 00000000000..deba49da722
--- /dev/null
+++ b/db/schema_migrations/20250205200243
@@ -0,0 +1 @@
+af28a4dd7ffa460c0de5210e18b0e49251111def819900cdddee4ac7eac7836e
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200244 b/db/schema_migrations/20250205200244
new file mode 100644
index 00000000000..4dbb363a3d0
--- /dev/null
+++ b/db/schema_migrations/20250205200244
@@ -0,0 +1 @@
+5b89d4b0d2110f55657be74428a74c8b5cd78fa99eaba4ed2568651e537c2526
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200245 b/db/schema_migrations/20250205200245
new file mode 100644
index 00000000000..30d5d8a6112
--- /dev/null
+++ b/db/schema_migrations/20250205200245
@@ -0,0 +1 @@
+9065517b8eb6d7aae5a93588ef06dba7e4b0037ea80e3a55593f7057fcc87fde
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200246 b/db/schema_migrations/20250205200246
new file mode 100644
index 00000000000..d21a4276ed6
--- /dev/null
+++ b/db/schema_migrations/20250205200246
@@ -0,0 +1 @@
+5cf2aa3aee0ba29ce93901d2ada8d02b8bc076c5ed27634941ca49a04ff68a17
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200247 b/db/schema_migrations/20250205200247
new file mode 100644
index 00000000000..576b79faded
--- /dev/null
+++ b/db/schema_migrations/20250205200247
@@ -0,0 +1 @@
+03906fab054e0a7ace028e39d14ff9cc40bd40678d9ce84638cbfa344de44789
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200739 b/db/schema_migrations/20250205200739
new file mode 100644
index 00000000000..0b4950db6d0
--- /dev/null
+++ b/db/schema_migrations/20250205200739
@@ -0,0 +1 @@
+f50e4dc6031d5bad0b4ac96d58e2c4966363e8a47b1b4b0a66da9e599091cc2f
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200740 b/db/schema_migrations/20250205200740
new file mode 100644
index 00000000000..0ce5580ea80
--- /dev/null
+++ b/db/schema_migrations/20250205200740
@@ -0,0 +1 @@
+629208c7a0f038bf5da3923a75168914969a29a7e02691a48ba451cbb6a90c93
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200741 b/db/schema_migrations/20250205200741
new file mode 100644
index 00000000000..86952343cde
--- /dev/null
+++ b/db/schema_migrations/20250205200741
@@ -0,0 +1 @@
+50fbe0987f725029e24b937dcd7d050a849a4bdae6ee1461060d462442291688
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200742 b/db/schema_migrations/20250205200742
new file mode 100644
index 00000000000..9c991e2421d
--- /dev/null
+++ b/db/schema_migrations/20250205200742
@@ -0,0 +1 @@
+b8ae6d4ebd571daf755d9406d62d29d3755c21b00e53152d3bac23aae2fdbcd4
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200743 b/db/schema_migrations/20250205200743
new file mode 100644
index 00000000000..f5cf57b47df
--- /dev/null
+++ b/db/schema_migrations/20250205200743
@@ -0,0 +1 @@
+ed8eef791c3c774b333d7788e3fa5d755432334599e4ed541b77d169f361e074
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200744 b/db/schema_migrations/20250205200744
new file mode 100644
index 00000000000..f8139253971
--- /dev/null
+++ b/db/schema_migrations/20250205200744
@@ -0,0 +1 @@
+ec4dbab30b7eb5a44da6a6ac1c5a541a6b0051f0fc46fd6605c6eb5863042008
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200745 b/db/schema_migrations/20250205200745
new file mode 100644
index 00000000000..4f5ebe24904
--- /dev/null
+++ b/db/schema_migrations/20250205200745
@@ -0,0 +1 @@
+571adfc1aa1bebe56be66f038c153dddf975cbc7c92aba05e35ca7b39fb54d20
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200746 b/db/schema_migrations/20250205200746
new file mode 100644
index 00000000000..acda226a44f
--- /dev/null
+++ b/db/schema_migrations/20250205200746
@@ -0,0 +1 @@
+3a5b3cd0f8e5ab6fd0b8e677056282049dc121f42b7f8773d6e48b35520b3e76
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200747 b/db/schema_migrations/20250205200747
new file mode 100644
index 00000000000..ad39e547f24
--- /dev/null
+++ b/db/schema_migrations/20250205200747
@@ -0,0 +1 @@
+8bf3bb128a669b7b15d022991d9f4a6b9b7fd4c4489c81d4845ed80fc34a8e49
\ No newline at end of file
diff --git a/db/schema_migrations/20250205200748 b/db/schema_migrations/20250205200748
new file mode 100644
index 00000000000..b1a310a7d5a
--- /dev/null
+++ b/db/schema_migrations/20250205200748
@@ -0,0 +1 @@
+a6c979aff865b8ff26d5449e73b1e3fe94480081b8cdf2cb30ced894deffa51e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index f40d29d46d7..8a72cc1f312 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1787,6 +1787,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_3be1956babdb() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."snippet_organization_id" IS NULL THEN
+  SELECT "organization_id"
+  INTO NEW."snippet_organization_id"
+  FROM "snippets"
+  WHERE "snippets"."id" = NEW."snippet_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_3d1a58344b29() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -1931,6 +1947,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_47b402bdab5f() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."project_id"
+  FROM "bulk_import_exports"
+  WHERE "bulk_import_exports"."id" = NEW."export_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_49862b4b3035() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -2536,6 +2568,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_8ba074736a77() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."snippet_project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."snippet_project_id"
+  FROM "snippets"
+  WHERE "snippets"."id" = NEW."snippet_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_8d002f38bdef() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -2664,6 +2712,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_951ac22c24d7() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."protected_branch_namespace_id" IS NULL THEN
+  SELECT "namespace_id"
+  INTO NEW."protected_branch_namespace_id"
+  FROM "protected_branches"
+  WHERE "protected_branches"."id" = NEW."protected_branch_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_96298f7da5d3() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -2920,6 +2984,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_b0f4298cadff() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."protected_branch_project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."protected_branch_project_id"
+  FROM "protected_branches"
+  WHERE "protected_branches"."id" = NEW."protected_branch_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_b2612138515d() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -3240,6 +3320,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_de59b81d3044() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."group_id" IS NULL THEN
+  SELECT "group_id"
+  INTO NEW."group_id"
+  FROM "bulk_import_exports"
+  WHERE "bulk_import_exports"."id" = NEW."export_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_dfad97659d5f() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -9546,6 +9642,8 @@ CREATE TABLE bulk_import_export_batches (
     batch_number integer DEFAULT 0 NOT NULL,
     objects_count integer DEFAULT 0 NOT NULL,
     error text,
+    project_id bigint,
+    group_id bigint,
     CONSTRAINT check_046dc60dfe CHECK ((char_length(error) <= 255))
 );
 
@@ -20348,6 +20446,8 @@ CREATE TABLE required_code_owners_sections (
     id bigint NOT NULL,
     protected_branch_id bigint NOT NULL,
     name text NOT NULL,
+    protected_branch_project_id bigint,
+    protected_branch_namespace_id bigint,
     CONSTRAINT check_e58d53741e CHECK ((char_length(name) <= 1024))
 );
 
@@ -21287,6 +21387,8 @@ CREATE TABLE snippet_repository_storage_moves (
     source_storage_name text NOT NULL,
     destination_storage_name text NOT NULL,
     error_message text,
+    snippet_project_id bigint,
+    snippet_organization_id bigint,
     CONSTRAINT check_a42ab83060 CHECK ((char_length(error_message) <= 256)),
     CONSTRAINT snippet_repository_storage_moves_destination_storage_name CHECK ((char_length(destination_storage_name) <= 255)),
     CONSTRAINT snippet_repository_storage_moves_source_storage_name CHECK ((char_length(source_storage_name) <= 255))
@@ -31428,6 +31530,10 @@ CREATE INDEX index_bulk_import_entities_on_parent_id ON bulk_import_entities USI
 
 CREATE INDEX index_bulk_import_entities_on_project_id ON bulk_import_entities USING btree (project_id);
 
+CREATE INDEX index_bulk_import_export_batches_on_group_id ON bulk_import_export_batches USING btree (group_id);
+
+CREATE INDEX index_bulk_import_export_batches_on_project_id ON bulk_import_export_batches USING btree (project_id);
+
 CREATE INDEX index_bulk_import_export_uploads_on_export_id ON bulk_import_export_uploads USING btree (export_id);
 
 CREATE INDEX index_bulk_import_export_uploads_on_group_id ON bulk_import_export_uploads USING btree (group_id);
@@ -34342,6 +34448,10 @@ CREATE INDEX index_remote_mirrors_on_project_id ON remote_mirrors USING btree (p
 
 CREATE INDEX index_required_code_owners_sections_on_protected_branch_id ON required_code_owners_sections USING btree (protected_branch_id);
 
+CREATE INDEX index_required_code_owners_sections_on_protected_branch_namespa ON required_code_owners_sections USING btree (protected_branch_namespace_id);
+
+CREATE INDEX index_required_code_owners_sections_on_protected_branch_project ON required_code_owners_sections USING btree (protected_branch_project_id);
+
 CREATE INDEX index_requirements_management_test_reports_on_author_id ON requirements_management_test_reports USING btree (author_id);
 
 CREATE INDEX index_requirements_management_test_reports_on_build_id ON requirements_management_test_reports USING btree (build_id);
@@ -34612,6 +34722,10 @@ CREATE INDEX index_snippet_repositories_verification_state ON snippet_repositori
 
 CREATE INDEX index_snippet_repository_storage_moves_on_snippet_id ON snippet_repository_storage_moves USING btree (snippet_id);
 
+CREATE INDEX index_snippet_repository_storage_moves_on_snippet_organization_ ON snippet_repository_storage_moves USING btree (snippet_organization_id);
+
+CREATE INDEX index_snippet_repository_storage_moves_on_snippet_project_id ON snippet_repository_storage_moves USING btree (snippet_project_id);
+
 CREATE INDEX index_snippet_repository_storage_moves_on_state ON snippet_repository_storage_moves USING btree (state) WHERE (state = ANY (ARRAY[2, 3]));
 
 CREATE UNIQUE INDEX index_snippet_user_mentions_on_note_id ON snippet_user_mentions USING btree (note_id) WHERE (note_id IS NOT NULL);
@@ -37882,6 +37996,8 @@ CREATE TRIGGER trigger_38bfee591e40 BEFORE INSERT OR UPDATE ON dependency_proxy_
 
 CREATE TRIGGER trigger_397d1b13068e BEFORE INSERT OR UPDATE ON issue_customer_relations_contacts FOR EACH ROW EXECUTE FUNCTION trigger_397d1b13068e();
 
+CREATE TRIGGER trigger_3be1956babdb BEFORE INSERT OR UPDATE ON snippet_repository_storage_moves FOR EACH ROW EXECUTE FUNCTION trigger_3be1956babdb();
+
 CREATE TRIGGER trigger_3d1a58344b29 BEFORE INSERT OR UPDATE ON alert_management_alert_assignees FOR EACH ROW EXECUTE FUNCTION trigger_3d1a58344b29();
 
 CREATE TRIGGER trigger_3e067fa9bfe3 BEFORE INSERT OR UPDATE ON incident_management_timeline_event_tag_links FOR EACH ROW EXECUTE FUNCTION trigger_3e067fa9bfe3();
@@ -37900,6 +38016,8 @@ CREATE TRIGGER trigger_468b8554e533 BEFORE INSERT OR UPDATE ON security_findings
 
 CREATE TRIGGER trigger_46ebe375f632 BEFORE INSERT OR UPDATE ON epic_issues FOR EACH ROW EXECUTE FUNCTION trigger_46ebe375f632();
 
+CREATE TRIGGER trigger_47b402bdab5f BEFORE INSERT OR UPDATE ON bulk_import_export_batches FOR EACH ROW EXECUTE FUNCTION trigger_47b402bdab5f();
+
 CREATE TRIGGER trigger_49862b4b3035 BEFORE INSERT OR UPDATE ON approval_group_rules_protected_branches FOR EACH ROW EXECUTE FUNCTION trigger_49862b4b3035();
 
 CREATE TRIGGER trigger_49b563d0130b BEFORE INSERT OR UPDATE ON dast_scanner_profiles_builds FOR EACH ROW EXECUTE FUNCTION trigger_49b563d0130b();
@@ -37982,6 +38100,8 @@ CREATE TRIGGER trigger_8ac78f164b2d BEFORE INSERT OR UPDATE ON design_management
 
 CREATE TRIGGER trigger_8b39d532224c BEFORE INSERT OR UPDATE ON ci_secure_file_states FOR EACH ROW EXECUTE FUNCTION trigger_8b39d532224c();
 
+CREATE TRIGGER trigger_8ba074736a77 BEFORE INSERT OR UPDATE ON snippet_repository_storage_moves FOR EACH ROW EXECUTE FUNCTION trigger_8ba074736a77();
+
 CREATE TRIGGER trigger_8d002f38bdef BEFORE INSERT OR UPDATE ON packages_debian_group_components FOR EACH ROW EXECUTE FUNCTION trigger_8d002f38bdef();
 
 CREATE TRIGGER trigger_8d17725116fe BEFORE INSERT OR UPDATE ON merge_request_reviewers FOR EACH ROW EXECUTE FUNCTION trigger_8d17725116fe();
@@ -37998,6 +38118,8 @@ CREATE TRIGGER trigger_9259aae92378 BEFORE INSERT OR UPDATE ON packages_build_in
 
 CREATE TRIGGER trigger_94514aeadc50 BEFORE INSERT OR UPDATE ON deployment_approvals FOR EACH ROW EXECUTE FUNCTION trigger_94514aeadc50();
 
+CREATE TRIGGER trigger_951ac22c24d7 BEFORE INSERT OR UPDATE ON required_code_owners_sections FOR EACH ROW EXECUTE FUNCTION trigger_951ac22c24d7();
+
 CREATE TRIGGER trigger_96298f7da5d3 BEFORE INSERT OR UPDATE ON protected_branch_unprotect_access_levels FOR EACH ROW EXECUTE FUNCTION trigger_96298f7da5d3();
 
 CREATE TRIGGER trigger_9699ea03bb37 BEFORE INSERT OR UPDATE ON related_epic_links FOR EACH ROW EXECUTE FUNCTION trigger_9699ea03bb37();
@@ -38028,6 +38150,8 @@ CREATE TRIGGER trigger_af3f17817e4d BEFORE INSERT OR UPDATE ON protected_tag_cre
 
 CREATE TRIGGER trigger_b046dd50c711 BEFORE INSERT OR UPDATE ON incident_management_oncall_rotations FOR EACH ROW EXECUTE FUNCTION trigger_b046dd50c711();
 
+CREATE TRIGGER trigger_b0f4298cadff BEFORE INSERT OR UPDATE ON required_code_owners_sections FOR EACH ROW EXECUTE FUNCTION trigger_b0f4298cadff();
+
 CREATE TRIGGER trigger_b2612138515d BEFORE INSERT OR UPDATE ON project_relation_exports FOR EACH ROW EXECUTE FUNCTION trigger_b2612138515d();
 
 CREATE TRIGGER trigger_b4520c29ea74 BEFORE INSERT OR UPDATE ON approval_merge_request_rule_sources FOR EACH ROW EXECUTE FUNCTION trigger_b4520c29ea74();
@@ -38074,6 +38198,8 @@ CREATE TRIGGER trigger_dbe374a57cbb BEFORE INSERT OR UPDATE ON status_page_publi
 
 CREATE TRIGGER trigger_dc13168b8025 BEFORE INSERT OR UPDATE ON vulnerability_flags FOR EACH ROW EXECUTE FUNCTION trigger_dc13168b8025();
 
+CREATE TRIGGER trigger_de59b81d3044 BEFORE INSERT OR UPDATE ON bulk_import_export_batches FOR EACH ROW EXECUTE FUNCTION trigger_de59b81d3044();
+
 CREATE TRIGGER trigger_delete_project_namespace_on_project_delete AFTER DELETE ON projects FOR EACH ROW WHEN ((old.project_namespace_id IS NOT NULL)) EXECUTE FUNCTION delete_associated_project_namespace();
 
 CREATE TRIGGER trigger_dfad97659d5f BEFORE INSERT OR UPDATE ON issuable_severities FOR EACH ROW EXECUTE FUNCTION trigger_dfad97659d5f();
@@ -38459,6 +38585,9 @@ ALTER TABLE ONLY import_failures
 ALTER TABLE ONLY project_ci_cd_settings
     ADD CONSTRAINT fk_24c15d2f2e FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY snippet_repository_storage_moves
+    ADD CONSTRAINT fk_2522a20cfb FOREIGN KEY (snippet_project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY security_pipeline_execution_policy_config_links
     ADD CONSTRAINT fk_256bbe966d FOREIGN KEY (security_policy_id) REFERENCES security_policies(id) ON DELETE CASCADE;
 
@@ -38531,6 +38660,9 @@ ALTER TABLE ONLY vulnerability_merge_request_links
 ALTER TABLE ONLY jira_tracker_data
     ADD CONSTRAINT fk_2ef8e4e35b FOREIGN KEY (instance_integration_id) REFERENCES instance_integrations(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY required_code_owners_sections
+    ADD CONSTRAINT fk_2f43f5cbbb FOREIGN KEY (protected_branch_project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY duo_workflows_workflows
     ADD CONSTRAINT fk_2f6398d8ee FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
@@ -38561,6 +38693,9 @@ ALTER TABLE ONLY approvals
 ALTER TABLE ONLY namespaces
     ADD CONSTRAINT fk_319256d87a FOREIGN KEY (file_template_project_id) REFERENCES projects(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY snippet_repository_storage_moves
+    ADD CONSTRAINT fk_321e6c6235 FOREIGN KEY (snippet_organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_request_approval_metrics
     ADD CONSTRAINT fk_324639fb86 FOREIGN KEY (target_project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
@@ -39251,6 +39386,9 @@ ALTER TABLE ONLY vulnerability_occurrences
 ALTER TABLE ONLY project_control_compliance_statuses
     ADD CONSTRAINT fk_9826fbb4a6 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY required_code_owners_sections
+    ADD CONSTRAINT fk_98c3f48741 FOREIGN KEY (protected_branch_namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY protected_branch_merge_access_levels
     ADD CONSTRAINT fk_98f3d044fe FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
@@ -39953,6 +40091,9 @@ ALTER TABLE ONLY vulnerability_external_issue_links
 ALTER TABLE ONLY epics
     ADD CONSTRAINT fk_f081aa4489 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY bulk_import_export_batches
+    ADD CONSTRAINT fk_f0e254a867 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY abuse_reports
     ADD CONSTRAINT fk_f10de8b524 FOREIGN KEY (resolved_by_id) REFERENCES users(id) ON DELETE SET NULL;
 
@@ -39974,6 +40115,9 @@ ALTER TABLE ONLY workspaces_agent_configs
 ALTER TABLE p_ci_pipeline_variables
     ADD CONSTRAINT fk_f29c5f4380_p FOREIGN KEY (partition_id, pipeline_id) REFERENCES p_ci_pipelines(partition_id, id) ON UPDATE CASCADE ON DELETE CASCADE;
 
+ALTER TABLE ONLY bulk_import_export_batches
+    ADD CONSTRAINT fk_f2ab0c5303 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY work_item_select_field_values
     ADD CONSTRAINT fk_f2d308e706 FOREIGN KEY (custom_field_select_option_id) REFERENCES custom_field_select_options(id) ON DELETE CASCADE;
 
diff --git a/doc/administration/appearance.md b/doc/administration/appearance.md
index c1967eab808..2a3afbb9cf0 100644
--- a/doc/administration/appearance.md
+++ b/doc/administration/appearance.md
@@ -174,6 +174,33 @@ Add guidelines for profile images.
 
 GitLab supports [Libravatar](https://www.libravatar.org) is for avatar images, but you must manually enable Libravatar support on the GitLab instance. For more information, see [Libravatar](libravatar.md) to use the service.
 
+## Change the color theme for all new users
+
+To [change the default color theme](../user/profile/preferences.md#change-the-color-theme) for all new users:
+
+1. Add `gitlab_rails['gitlab_default_theme']` to your GitLab configuration file at `/etc/gitlab/gitlab.rb`:
+
+   ```ruby
+   gitlab_rails['gitlab_default_theme'] = 2
+   ```
+
+1. [Reconfigure and restart GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation).
+
+As of GitLab 17.8, `gitlab_default_theme` can specify [a value from 1 to 10](https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/17.8.0+ee.0/files/gitlab-config-template/gitlab.rb.template?ref_type=tags#L137) to set the default theme. 
+
+| Value | Color |
+| ------ | ------  |
+| 1       | Indigo |
+| 2       | Dark |
+| 3       | Light |
+| 4       | Blue |
+| 5       |Green|
+| 6       |Light Indigo|
+| 7       |Light Blue|
+| 8       |Light Green|
+| 9       |Red|
+| 10       |Light Red|
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/administration/dedicated/configure_instance/users_notifications.md b/doc/administration/dedicated/configure_instance/users_notifications.md
index 9f735cc4a97..83a482b82e9 100644
--- a/doc/administration/dedicated/configure_instance/users_notifications.md
+++ b/doc/administration/dedicated/configure_instance/users_notifications.md
@@ -19,7 +19,7 @@ Administrators can add Switchboard users to their GitLab Dedicated instance. The
 
 To add a new user to your GitLab Dedicated instance:
 
-1. From the **Tenants** page, select **Manage** next to the tenant instance.
+1. Sign in to [Switchboard](https://console.gitlab-dedicated.com/).
 1. From the top of the page, select **Users**.
 1. Select **New user**.
 1. Enter the **Email** and select a **Role** for the user.
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index f28496ed0ad..5a3045f707c 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -742,10 +742,13 @@ your provider's support.
 
 ### Configure assertions
 
+DETAILS:
+**Offering:** GitLab.com, GitLab Self-Managed
+
 > - Microsoft Azure/Entra ID attribute support [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/420766) in GitLab 16.7.
 
 NOTE:
-The attributes are case-sensitive.
+These attributes are case-sensitive.
 
 | Field           | Supported default keys                                                                                                                                                         |
 |-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
diff --git a/doc/update/breaking_windows.md b/doc/update/breaking_windows.md
index f7e6e385b42..6dd02140820 100644
--- a/doc/update/breaking_windows.md
+++ b/doc/update/breaking_windows.md
@@ -41,7 +41,6 @@ This window takes place on April 21 - 23, 2025 from 09:00 UTC to 22:00 UTC.
 | [Deprecate CI job implementation of Repository X-Ray](https://gitlab.com/gitlab-org/gitlab/-/issues/500146) | Low | Create | Project |
 | [Pipeline job limits extended to the Commits API](https://gitlab.com/gitlab-org/gitlab/-/issues/436361) | Low | Verify | Project |
 | [Deprecation of `name` field in `ProjectMonthlyUsageType` GraphQL API](https://gitlab.com/gitlab-org/gitlab/-/issues/381894) | Low | Fulfillment | Project |
-| [Rename 'setPreReceiveSecretDetection' GraphQL mutation to 'setSecretPushProtection'](https://gitlab.com/gitlab-org/gitlab/-/issues/462504) | Low | Application_security_testing | Project |
 | [Deprecation of `STORAGE` enum in `NamespaceProjectSortEnum` GraphQL API](https://gitlab.com/gitlab-org/gitlab/-/issues/396284) | Low | Fulfillment | Group |
 | [Workspaces `editor` GraphQL field is deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/508155) | Low | Create | Project |
 | [Enforce keyset pagination on audit event API](https://gitlab.com/gitlab-org/gitlab/-/issues/382338) | Low | Software supply chain security | Instance, group, project |
@@ -85,6 +84,7 @@ This window takes place on May 5 - 7, 2025 from 09:00 UTC to 22:00 UTC.
 | [`ciJobTokenScopeAddProject` GraphQL mutation is deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/474175) | Low | Govern | Project |
 | [Guest users can pull packages from private projects on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/336622) | High | Package | Project |
 | [Removal of `migrationState` field in `ContainerRepository` GraphQL API](https://gitlab.com/gitlab-org/gitlab/-/issues/459869) | Low | Package | Project |
+| [Rename `setPreReceiveSecretDetection` GraphQL mutation to `setSecretPushProtection`](https://gitlab.com/gitlab-org/gitlab/-/issues/514414) | Medium | Application_security_testing | Project |
 | [Updated tooling to release CI/CD components to the Catalog](https://gitlab.com/groups/gitlab-org/-/epics/12788) | High | Verify | Instance |
 | [Increased default security for use of pipeline variables](https://gitlab.com/gitlab-org/gitlab/-/issues/502382) | Medium | Verify | Project |
 | [Amazon S3 Signature Version 2](https://gitlab.com/gitlab-org/container-registry/-/issues/1449) | Low | Package | Project |
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index a8631e98c6c..3c6fa4cf4b1 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1312,17 +1312,21 @@ In 18.0 we are removing the `duoProAssignedUsersCount` GraphQL field. Users may
 
 <div class="deprecation breaking-change" data-milestone="18.0">
 
-### Rename 'setPreReceiveSecretDetection' GraphQL mutation to 'setSecretPushProtection'
+### Rename `setPreReceiveSecretDetection` GraphQL mutation to `setSecretPushProtection`
 
 <div class="deprecation-notes">
 
 - Announced in GitLab <span class="milestone">17.7</span>
 - Removal in GitLab <span class="milestone">18.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
-- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/462504).
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/514414).
 
 </div>
 
-The 'setPreReceiveSecretDetection' GraphQL mutation has been renamed to 'setSecretPushProtection'.
+The `setPreReceiveSecretDetection` GraphQL mutation has been renamed to `setSecretPushProtection`. We are also renaming some fields in the mutation's response to reflect the name change of the feature `pre_receive_secret_detection` to `secret_push_protection`.
+To avoid breaking workflows that use the old name, before GitLab 18.0 you should:
+
+- Stop using the old mutation name `setPreReceiveSecretDetection`. Instead, use the name `setSecretPushProtection`.
+- Change any references to the field `pre_receive_secret_detection_enabled` to `secret_push_protection_enabled`.
 
 </div>
 
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index b3c6712fb31..198374e6572 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -180,7 +180,7 @@ To set up OneLogin as your identity provider:
 ### Configure assertions
 
 NOTE:
-The attributes are case-insensitive.
+These attributes are case-insensitive.
 
 At minimum, you must configure the following assertions:
 
@@ -193,7 +193,7 @@ Optionally, you can pass user information to GitLab as attributes in the SAML as
 - The username can be either a **username** or **nickname** attribute. You should specify only
   one of these.
 
-For more information, see the [attributes available for GitLab Self-Managed](../../../integration/saml.md#configure-assertions).
+For more information on available attributes, see [SAML SSO for GitLab Self-Managed](../../../integration/saml.md#configure-assertions).
 
 ### Use metadata
 
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
index 5f768f9d540..30f6b2ac45b 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
@@ -8,7 +8,7 @@ title: GitLab Pages Let's Encrypt certificates
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
-**Offering:** GitLab.com, GitLab Self-Managed, GitLab Dedicated
+**Offering:** GitLab.com, GitLab Self-Managed
 
 The GitLab Pages integration with Let's Encrypt (LE) allows you
 to use LE certificates for your Pages website with custom domains
diff --git a/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id.rb b/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id.rb
new file mode 100644
index 00000000000..d4e53bda75b
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillBulkImportExportBatchesGroupId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_bulk_import_export_batches_group_id
+      feature_category :importers
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id.rb b/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id.rb
new file mode 100644
index 00000000000..36bbbbc903c
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillBulkImportExportBatchesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_bulk_import_export_batches_project_id
+      feature_category :importers
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id.rb b/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id.rb
new file mode 100644
index 00000000000..b517c332885
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_required_code_owners_sections_protected_branch_namespace_id
+      feature_category :source_code_management
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id.rb b/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id.rb
new file mode 100644
index 00000000000..14391a34944
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillRequiredCodeOwnersSectionsProtectedBranchProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_required_code_owners_sections_protected_branch_project_id
+      feature_category :source_code_management
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id.rb b/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id.rb
new file mode 100644
index 00000000000..6b9122a99e7
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillSnippetRepositoryStorageMovesSnippetOrganizationId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_snippet_repository_storage_moves_snippet_organization_id
+      feature_category :source_code_management
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id.rb b/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id.rb
new file mode 100644
index 00000000000..3069a596a6e
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillSnippetRepositoryStorageMovesSnippetProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_snippet_repository_storage_moves_snippet_project_id
+      feature_category :source_code_management
+    end
+  end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 575a67bfdd6..d362a42b615 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -21202,6 +21202,9 @@ msgstr ""
 msgid "Downstream"
 msgstr ""
 
+msgid "Downstream pipeline"
+msgstr ""
+
 msgid "Downvotes"
 msgstr ""
 
@@ -69495,6 +69498,9 @@ msgstr ""
 msgid "units"
 msgstr ""
 
+msgid "unknown"
+msgstr ""
+
 msgid "unsubscribed %{emails}"
 msgstr ""
 
diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk
index d795a6a831d..d58739ca61d 100644
--- a/qa/gdk/Dockerfile.gdk
+++ b/qa/gdk/Dockerfile.gdk
@@ -1,4 +1,4 @@
-ARG GDK_SHA=575bcba2b31dcd79391f841c3da9d3e2d3532209
+ARG GDK_SHA=ec2dbaf1ea2d19566d1d72c1ddc1815ff501a9ad
 # Use tag prefix when running on 'stable' branch to make sure 'protected' image is used which is not deleted by registry cleanup
 ARG GDK_BASE_TAG_PREFIX
 
diff --git a/spec/frontend/ci/job_details/components/log/line_header_spec.js b/spec/frontend/ci/job_details/components/log/line_header_spec.js
index 313fc11646f..998b95b2b45 100644
--- a/spec/frontend/ci/job_details/components/log/line_header_spec.js
+++ b/spec/frontend/ci/job_details/components/log/line_header_spec.js
@@ -153,7 +153,7 @@ describe('Job Log Header Line', () => {
       });
 
       it('highlights line', () => {
-        expect(wrapper.classes()).toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).toContain('job-log-line-highlight');
       });
     });
 
@@ -165,7 +165,7 @@ describe('Job Log Header Line', () => {
       });
 
       it('does not highlight line', () => {
-        expect(wrapper.classes()).not.toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).not.toContain('job-log-line-highlight');
       });
     });
 
@@ -173,13 +173,13 @@ describe('Job Log Header Line', () => {
       it('highlights the job log lines', () => {
         createComponent({ ...defaultProps, isHighlighted: true });
 
-        expect(wrapper.classes()).toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).toContain('job-log-line-highlight');
       });
 
       it('does not highlight the job log lines', () => {
         createComponent();
 
-        expect(wrapper.classes()).not.toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).not.toContain('job-log-line-highlight');
       });
     });
   });
diff --git a/spec/frontend/ci/job_details/components/log/line_spec.js b/spec/frontend/ci/job_details/components/log/line_spec.js
index 194bea96205..ec54d8b029c 100644
--- a/spec/frontend/ci/job_details/components/log/line_spec.js
+++ b/spec/frontend/ci/job_details/components/log/line_spec.js
@@ -244,7 +244,7 @@ describe('Job Log Line', () => {
         isHighlighted: true,
       });
 
-      expect(wrapper.classes()).toContain('gl-bg-gray-700');
+      expect(wrapper.classes()).toContain('job-log-line-highlight');
     });
 
     it('does not apply highlight class to search result elements', () => {
@@ -258,7 +258,7 @@ describe('Job Log Line', () => {
         path: '/root/ci-project/-/jobs/1089',
       });
 
-      expect(wrapper.classes()).not.toContain('gl-bg-gray-700');
+      expect(wrapper.classes()).not.toContain('job-log-line-highlight');
     });
   });
 
@@ -279,7 +279,7 @@ describe('Job Log Line', () => {
           path: '/root/ci-project/-/jobs/6353',
         });
 
-        expect(wrapper.classes()).toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).toContain('job-log-line-highlight');
       });
     });
 
@@ -299,7 +299,7 @@ describe('Job Log Line', () => {
           path: '/root/ci-project/-/jobs/6353',
         });
 
-        expect(wrapper.classes()).not.toContain('gl-bg-gray-700');
+        expect(wrapper.classes()).not.toContain('job-log-line-highlight');
       });
     });
   });
diff --git a/spec/frontend/ci/pipeline_mini_graph/downstream_pipeline_dropdown_spec.js b/spec/frontend/ci/pipeline_mini_graph/downstream_pipeline_dropdown_spec.js
new file mode 100644
index 00000000000..01e0022f4ef
--- /dev/null
+++ b/spec/frontend/ci/pipeline_mini_graph/downstream_pipeline_dropdown_spec.js
@@ -0,0 +1,47 @@
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import { createMockDirective } from 'helpers/vue_mock_directive';
+import DownstreamPipelineDropdown from '~/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue';
+import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import { singlePipeline } from './mock_data';
+
+describe('Downstream Pipeline Dropdown', () => {
+  let wrapper;
+
+  const defaultProps = {
+    pipeline: singlePipeline,
+  };
+
+  const createComponent = () => {
+    wrapper = shallowMountExtended(DownstreamPipelineDropdown, {
+      directives: {
+        GlTooltip: createMockDirective('gl-tooltip'),
+      },
+      propsData: {
+        ...defaultProps,
+      },
+    });
+  };
+
+  const findDropdownButton = () => wrapper.findComponent(CiIcon);
+
+  describe('dropdown button', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('should pass the status to ci icon', () => {
+      expect(findDropdownButton().props('status')).toBe(singlePipeline.detailedStatus);
+
+      expect(findDropdownButton().props('status')).toEqual(
+        expect.objectContaining({
+          icon: expect.any(String),
+          detailsPath: expect.any(String),
+        }),
+      );
+    });
+
+    it('should have the correct title assigned for the tooltip', () => {
+      expect(findDropdownButton().attributes('title')).toBe('trigger-downstream - passed');
+    });
+  });
+});
diff --git a/spec/frontend/ci/pipeline_mini_graph/downstream_pipelines_spec.js b/spec/frontend/ci/pipeline_mini_graph/downstream_pipelines_spec.js
index 26b937dca3a..cd4633f3544 100644
--- a/spec/frontend/ci/pipeline_mini_graph/downstream_pipelines_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/downstream_pipelines_spec.js
@@ -1,20 +1,18 @@
-import { mountExtended } from 'helpers/vue_test_utils_helper';
-import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import DownstreamPipelines from '~/ci/pipeline_mini_graph/downstream_pipelines.vue';
+import DownstreamPipelineDropdown from '~/ci/pipeline_mini_graph/downstream_pipeline_dropdown.vue';
 import { downstreamPipelines, singlePipeline } from './mock_data';
 
 describe('Downstream Pipelines', () => {
   let wrapper;
 
-  const findCiIcons = () => wrapper.findAllComponents(CiIcon);
+  const findDownstreamDropdowns = () => wrapper.findAllComponents(DownstreamPipelineDropdown);
   const findPipelineCounter = () => wrapper.findByTestId('downstream-pipeline-counter');
-  const findDownstreamPipeline = () => wrapper.findByTestId('downstream-pipelines');
-  const findDownstreamPipelines = () => wrapper.findAllByTestId('downstream-pipelines');
   const findDownstreamPipelinesComponent = () => wrapper.findComponent(DownstreamPipelines);
 
   const createComponent = (props = {}) => {
-    wrapper = mountExtended(DownstreamPipelines, {
+    wrapper = shallowMountExtended(DownstreamPipelines, {
       directives: {
         GlTooltip: createMockDirective('gl-tooltip'),
       },
@@ -32,14 +30,8 @@ describe('Downstream Pipelines', () => {
       });
     });
 
-    it('should render the correct ci status icon', () => {
-      const findIcon = () => wrapper.findByTestId('status_success_borderless-icon');
-
-      expect(findIcon().exists()).toBe(true);
-    });
-
-    it('should have the correct title assigned for the tooltip', () => {
-      expect(findDownstreamPipeline().attributes('title')).toBe('trigger-downstream - passed');
+    it('should render 1 dropdown', () => {
+      expect(findDownstreamDropdowns()).toHaveLength(1);
     });
 
     it('should not render the pipeline counter', () => {
@@ -56,19 +48,14 @@ describe('Downstream Pipelines', () => {
     });
 
     describe('pipelines', () => {
-      it('should render three pipeline items', () => {
-        expect(findDownstreamPipelines().exists()).toBe(true);
-        expect(findDownstreamPipelines()).toHaveLength(3);
-      });
-
-      it('should render three ci status icons', () => {
-        expect(findCiIcons().exists()).toBe(true);
-        expect(findCiIcons()).toHaveLength(3);
+      it('should render three dropdowns', () => {
+        expect(findDownstreamDropdowns().exists()).toBe(true);
+        expect(findDownstreamDropdowns()).toHaveLength(3);
       });
 
       it('should correctly trim pipelines', () => {
         expect(findDownstreamPipelinesComponent().props('pipelines')).toHaveLength(4);
-        expect(findDownstreamPipelines()).toHaveLength(3);
+        expect(findDownstreamDropdowns()).toHaveLength(3);
       });
     });
 
diff --git a/spec/frontend/ci/pipeline_new/components/identity_verification_required_pipeline_new_form_spec.js b/spec/frontend/ci/pipeline_new/components/identity_verification_required_pipeline_new_form_spec.js
index bd1800abab2..da500b2f741 100644
--- a/spec/frontend/ci/pipeline_new/components/identity_verification_required_pipeline_new_form_spec.js
+++ b/spec/frontend/ci/pipeline_new/components/identity_verification_required_pipeline_new_form_spec.js
@@ -7,10 +7,9 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import axios from '~/lib/utils/axios_utils';
-import { HTTP_STATUS_BAD_REQUEST } from '~/lib/utils/http_status';
 import PipelineNewForm from '~/ci/pipeline_new/components/pipeline_new_form.vue';
+import pipelineCreateMutation from '~/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql';
 import ciConfigVariablesQuery from '~/ci/pipeline_new/graphql/queries/ci_config_variables.graphql';
-import { resolvers } from '~/ci/pipeline_new/graphql/resolvers';
 import {
   mockIdentityVerificationRequiredError,
   mockEmptyCiConfigVariablesResponse,
@@ -30,6 +29,7 @@ describe('Pipeline New Form', () => {
   let mockApollo;
   let mockCiConfigVariables;
   let dummySubmitEvent;
+  const pipelineCreateMutationHandler = jest.fn();
 
   const findForm = () => wrapper.findComponent(GlForm);
   const findErrorAlert = () => wrapper.findByTestId('run-pipeline-error-alert');
@@ -37,8 +37,11 @@ describe('Pipeline New Form', () => {
     wrapper.findComponent(PipelineAccountVerificationAlert);
 
   const createComponentWithApollo = ({ props = {} } = {}) => {
-    const handlers = [[ciConfigVariablesQuery, mockCiConfigVariables]];
-    mockApollo = createMockApollo(handlers, resolvers);
+    const handlers = [
+      [ciConfigVariablesQuery, mockCiConfigVariables],
+      [pipelineCreateMutation, pipelineCreateMutationHandler],
+    ];
+    mockApollo = createMockApollo(handlers);
 
     wrapper = shallowMountExtended(PipelineNewForm, {
       apolloProvider: mockApollo,
@@ -56,6 +59,7 @@ describe('Pipeline New Form', () => {
         refParam: defaultBranch,
         settingsLink: '',
         maxWarnings: 25,
+        isMaintainer: false,
         ...props,
       },
     });
@@ -77,13 +81,10 @@ describe('Pipeline New Form', () => {
   describe('Form errors and warnings', () => {
     describe('when the error response is identity verification required', () => {
       beforeEach(async () => {
+        pipelineCreateMutationHandler.mockResolvedValue(mockIdentityVerificationRequiredError);
         mockCiConfigVariables.mockResolvedValue(mockEmptyCiConfigVariablesResponse);
         createComponentWithApollo();
 
-        mock
-          .onPost(pipelinesPath)
-          .reply(HTTP_STATUS_BAD_REQUEST, mockIdentityVerificationRequiredError);
-
         findForm().vm.$emit('submit', dummySubmitEvent);
 
         await waitForPromises();
diff --git a/spec/frontend/ci/pipeline_new/components/pipeline_new_form_spec.js b/spec/frontend/ci/pipeline_new/components/pipeline_new_form_spec.js
index 12042dd4058..762b788fef5 100644
--- a/spec/frontend/ci/pipeline_new/components/pipeline_new_form_spec.js
+++ b/spec/frontend/ci/pipeline_new/components/pipeline_new_form_spec.js
@@ -1,32 +1,28 @@
 import Vue, { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
-import { GlForm, GlSprintf, GlLoadingIcon, GlIcon } from '@gitlab/ui';
+import { GlForm, GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
+import mockPipelineCreateMutationResponse from 'test_fixtures/graphql/pipelines/create_pipeline.mutation.graphql.json';
+import mockPipelineCreateMutationErrorResponse from 'test_fixtures/graphql/pipelines/create_pipeline_error.mutation.graphql.json';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import axios from '~/lib/utils/axios_utils';
-import {
-  HTTP_STATUS_BAD_REQUEST,
-  HTTP_STATUS_INTERNAL_SERVER_ERROR,
-  HTTP_STATUS_OK,
-} from '~/lib/utils/http_status';
+import { HTTP_STATUS_INTERNAL_SERVER_ERROR } from '~/lib/utils/http_status';
 import { visitUrl } from '~/lib/utils/url_utility';
 import PipelineNewForm, {
   POLLING_INTERVAL,
 } from '~/ci/pipeline_new/components/pipeline_new_form.vue';
 import ciConfigVariablesQuery from '~/ci/pipeline_new/graphql/queries/ci_config_variables.graphql';
-import { resolvers } from '~/ci/pipeline_new/graphql/resolvers';
+import pipelineCreateMutation from '~/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql';
 import RefsDropdown from '~/ci/pipeline_new/components/refs_dropdown.vue';
 import VariableValuesListbox from '~/ci/pipeline_new/components/variable_values_listbox.vue';
 import {
   mockCiConfigVariablesResponse,
   mockCiConfigVariablesResponseWithoutDesc,
   mockEmptyCiConfigVariablesResponse,
-  mockError,
   mockNoCachedCiConfigVariablesResponse,
   mockQueryParams,
-  mockPostParams,
   mockProjectId,
   mockYamlVariables,
   mockPipelineConfigButtonText,
@@ -43,7 +39,6 @@ jest.mock('~/lib/utils/url_utility', () => ({
 const pipelinesPath = '/root/project/-/pipelines';
 const pipelinesEditorPath = '/root/project/-/ci/editor';
 const projectPath = '/root/project/-/pipelines/config_variables';
-const newPipelinePostResponse = { id: 1 };
 const defaultBranch = 'main';
 
 describe('Pipeline New Form', () => {
@@ -53,6 +48,8 @@ describe('Pipeline New Form', () => {
   let mockCiConfigVariables;
   let dummySubmitEvent;
 
+  const pipelineCreateMutationHandler = jest.fn();
+
   const findForm = () => wrapper.findComponent(GlForm);
   const findRefsDropdown = () => wrapper.findComponent(RefsDropdown);
   const findSubmitButton = () => wrapper.findByTestId('run-pipeline-button');
@@ -66,11 +63,8 @@ describe('Pipeline New Form', () => {
   const findErrorAlert = () => wrapper.findByTestId('run-pipeline-error-alert');
   const findPipelineConfigButton = () => wrapper.findByTestId('ci-cd-pipeline-configuration');
   const findWarningAlert = () => wrapper.findByTestId('run-pipeline-warning-alert');
-  const findWarningAlertSummary = () => findWarningAlert().findComponent(GlSprintf);
-  const findWarnings = () => wrapper.findAllByTestId('run-pipeline-warning');
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const findCiCdSettingsLink = () => wrapper.findByTestId('ci-cd-settings-link');
-  const getFormPostParams = () => JSON.parse(mock.history.post[0].data);
 
   const advanceToNextFetch = (milliseconds) => {
     jest.advanceTimersByTime(milliseconds);
@@ -99,8 +93,11 @@ describe('Pipeline New Form', () => {
     mountFn = shallowMountExtended,
     stubs = {},
   } = {}) => {
-    const handlers = [[ciConfigVariablesQuery, mockCiConfigVariables]];
-    mockApollo = createMockApollo(handlers, resolvers);
+    const handlers = [
+      [ciConfigVariablesQuery, mockCiConfigVariables],
+      [pipelineCreateMutation, pipelineCreateMutationHandler],
+    ];
+    mockApollo = createMockApollo(handlers);
 
     wrapper = mountFn(PipelineNewForm, {
       apolloProvider: mockApollo,
@@ -208,7 +205,7 @@ describe('Pipeline New Form', () => {
   describe('Pipeline creation', () => {
     beforeEach(() => {
       mockCiConfigVariables.mockResolvedValue(mockEmptyCiConfigVariablesResponse);
-      mock.onPost(pipelinesPath).reply(HTTP_STATUS_OK, newPipelinePostResponse);
+      pipelineCreateMutationHandler.mockResolvedValue(mockPipelineCreateMutationResponse);
     });
 
     it('does not submit the native HTML form', () => {
@@ -224,33 +221,45 @@ describe('Pipeline New Form', () => {
 
       expect(findSubmitButton().props('disabled')).toBe(false);
 
-      findForm().vm.$emit('submit', dummySubmitEvent);
-      await waitForPromises();
+      await findForm().vm.$emit('submit', dummySubmitEvent);
 
       expect(findSubmitButton().props('disabled')).toBe(true);
     });
 
-    it('creates pipeline with full ref and variables', async () => {
+    it('fires the mutation when the submit button is clicked', async () => {
       createComponentWithApollo();
 
       findForm().vm.$emit('submit', dummySubmitEvent);
       await waitForPromises();
 
-      expect(getFormPostParams().ref).toEqual(`refs/heads/${defaultBranch}`);
-      expect(visitUrl).toHaveBeenCalledWith(`${pipelinesPath}/${newPipelinePostResponse.id}`);
+      expect(pipelineCreateMutationHandler).toHaveBeenCalled();
     });
 
-    it('creates a pipeline with short ref and variables from the query params', async () => {
-      createComponentWithApollo({ props: mockQueryParams });
+    it('creates pipeline with ref and variables', async () => {
+      createComponentWithApollo();
 
+      findForm().vm.$emit('submit', dummySubmitEvent);
+      await waitForPromises();
+
+      expect(pipelineCreateMutationHandler).toHaveBeenCalledWith({
+        input: {
+          ref: 'main',
+          projectPath: '/root/project/-/pipelines/config_variables',
+          variables: [],
+        },
+      });
+    });
+
+    it('navigates to the created pipeline', async () => {
+      const pipelinePath = mockPipelineCreateMutationResponse.data.pipelineCreate.pipeline.path;
+
+      createComponentWithApollo();
       await waitForPromises();
 
       findForm().vm.$emit('submit', dummySubmitEvent);
-
       await waitForPromises();
 
-      expect(getFormPostParams()).toEqual(mockPostParams);
-      expect(visitUrl).toHaveBeenCalledWith(`${pipelinesPath}/${newPipelinePostResponse.id}`);
+      expect(visitUrl).toHaveBeenCalledWith(pipelinePath);
     });
   });
 
@@ -491,38 +500,29 @@ describe('Pipeline New Form', () => {
         findRefsDropdown().vm.$emit('loadingError');
       });
 
-      it('shows both an error alert', () => {
+      it('shows an error alert', () => {
         expect(findErrorAlert().exists()).toBe(true);
         expect(findWarningAlert().exists()).toBe(false);
       });
     });
 
-    describe('when the error response can be handled', () => {
+    describe('when pipeline creation mutation is not successful', () => {
       beforeEach(async () => {
-        mock.onPost(pipelinesPath).reply(HTTP_STATUS_BAD_REQUEST, mockError);
+        pipelineCreateMutationHandler.mockResolvedValue(mockPipelineCreateMutationErrorResponse);
 
         findForm().vm.$emit('submit', dummySubmitEvent);
 
         await waitForPromises();
       });
 
-      it('shows both error and warning', () => {
+      it('shows error', () => {
         expect(findErrorAlert().exists()).toBe(true);
-        expect(findWarningAlert().exists()).toBe(true);
       });
 
       it('shows the correct error', () => {
-        expect(findErrorAlert().text()).toBe(mockError.errors[0]);
-      });
+        const error = mockPipelineCreateMutationErrorResponse.data.pipelineCreate.errors[0];
 
-      it('shows the correct warning title', () => {
-        const { length } = mockError.warnings;
-
-        expect(findWarningAlertSummary().attributes('message')).toBe(`${length} warnings found:`);
-      });
-
-      it('shows the correct amount of warnings', () => {
-        expect(findWarnings()).toHaveLength(mockError.warnings.length);
+        expect(findErrorAlert().text()).toBe(error);
       });
 
       it('re-enables the submit button', () => {
diff --git a/spec/frontend/ci/pipeline_new/mock_data.js b/spec/frontend/ci/pipeline_new/mock_data.js
index 9ed101b8c8e..8a57f675637 100644
--- a/spec/frontend/ci/pipeline_new/mock_data.js
+++ b/spec/frontend/ci/pipeline_new/mock_data.js
@@ -38,9 +38,14 @@ export const mockError = {
 };
 
 export const mockIdentityVerificationRequiredError = {
-  errors: ['Identity verification is required in order to run CI jobs'],
-  warnings: [],
-  total_warnings: 0,
+  data: {
+    pipelineCreate: {
+      clientMutationId: 'test-mutation-id',
+      errors: ['Identity verification is required in order to run CI jobs'],
+      pipeline: null,
+      __typename: 'PipelineCreatePayload',
+    },
+  },
 };
 
 export const mockBranchRefs = ['main', 'dev', 'release'];
diff --git a/spec/frontend/ci/pipeline_new/utils/filter_variables_spec.js b/spec/frontend/ci/pipeline_new/utils/filter_variables_spec.js
index d1b89704b58..8cd1aca100e 100644
--- a/spec/frontend/ci/pipeline_new/utils/filter_variables_spec.js
+++ b/spec/frontend/ci/pipeline_new/utils/filter_variables_spec.js
@@ -3,19 +3,19 @@ import { mockVariables } from '../mock_data';
 
 describe('Filter variables utility function', () => {
   it('filters variables that do not contain a key', () => {
-    const expectedVaraibles = [
+    const expectedVariables = [
       {
-        variable_type: 'env_var',
         key: 'var_without_value',
-        secret_value: '',
+        value: '',
+        variableType: 'ENV_VAR',
       },
       {
-        variable_type: 'env_var',
         key: 'var_with_value',
-        secret_value: 'test_value',
+        value: 'test_value',
+        variableType: 'ENV_VAR',
       },
     ];
 
-    expect(filterVariables(mockVariables)).toEqual(expectedVaraibles);
+    expect(filterVariables(mockVariables)).toEqual(expectedVariables);
   });
 });
diff --git a/spec/frontend/diffs/components/app_spec.js b/spec/frontend/diffs/components/app_spec.js
index f1adb07bc15..3c2e14c9ddc 100644
--- a/spec/frontend/diffs/components/app_spec.js
+++ b/spec/frontend/diffs/components/app_spec.js
@@ -657,47 +657,61 @@ describe('diffs/components/app', () => {
       );
     });
 
-    it('should always render diffs file tree', () => {
-      createComponent({});
-      expect(wrapper.findComponent(DiffsFileTree).exists()).toBe(true);
-    });
-
-    it('should pass visible to file tree as true when files are present', () => {
-      createComponent({
-        extendStore: ({ state }) => {
-          state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
-        },
+    describe('File browser', () => {
+      it('should always render diffs file tree', () => {
+        createComponent({});
+        expect(wrapper.findComponent(DiffsFileTree).exists()).toBe(true);
       });
-      expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(true);
-    });
 
-    it('should pass visible to file tree as false without files', () => {
-      createComponent({});
-      expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(false);
-    });
-
-    it('should hide file tree when toggled', async () => {
-      createComponent({
-        extendStore: ({ state }) => {
-          state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
-        },
+      it('should pass visible to file tree as true when files are present', () => {
+        createComponent({
+          extendStore: ({ state }) => {
+            state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
+          },
+        });
+        expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(true);
       });
-      wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
-      await nextTick();
-      expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(false);
-    });
 
-    it('should show file tree when toggled', async () => {
-      createComponent({
-        extendStore: ({ state }) => {
-          state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
-        },
+      it('should pass visible to file tree as false without files', () => {
+        createComponent({});
+        expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(false);
+      });
+
+      it('should hide file tree when toggled', async () => {
+        createComponent({
+          extendStore: ({ state }) => {
+            state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
+          },
+        });
+        wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
+        await nextTick();
+        expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(false);
+      });
+
+      it('should show file tree when toggled', async () => {
+        createComponent({
+          extendStore: ({ state }) => {
+            state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
+          },
+        });
+        wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
+        await nextTick();
+        wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
+        await nextTick();
+        expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(true);
+      });
+
+      it('should handle clickFile events', () => {
+        const file = { path: '111.js' };
+        createComponent({
+          extendStore: ({ state }) => {
+            state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
+          },
+        });
+        jest.spyOn(store, 'dispatch');
+        wrapper.findComponent(DiffsFileTree).vm.$emit('clickFile', file);
+        expect(store.dispatch).toHaveBeenCalledWith('diffs/goToFile', { path: file.path });
       });
-      wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
-      await nextTick();
-      wrapper.findComponent(DiffsFileTree).vm.$emit('toggled');
-      await nextTick();
-      expect(wrapper.findComponent(DiffsFileTree).props('visible')).toBe(true);
     });
   });
 
diff --git a/spec/frontend/diffs/components/diffs_file_tree_spec.js b/spec/frontend/diffs/components/diffs_file_tree_spec.js
index aab0c615f60..2dd7a56e6d1 100644
--- a/spec/frontend/diffs/components/diffs_file_tree_spec.js
+++ b/spec/frontend/diffs/components/diffs_file_tree_spec.js
@@ -21,6 +21,13 @@ describe('DiffsFileTree', () => {
     });
   };
 
+  it('re-emits clickFile event', () => {
+    const obj = {};
+    createComponent();
+    wrapper.findComponent(TreeList).vm.$emit('clickFile', obj);
+    expect(wrapper.emitted('clickFile')).toStrictEqual([[obj]]);
+  });
+
   describe('visibility', () => {
     describe('when renderDiffFiles and showTreeList are true', () => {
       beforeEach(() => {
diff --git a/spec/frontend/diffs/components/tree_list_spec.js b/spec/frontend/diffs/components/tree_list_spec.js
index 700f2fd75bc..1336334c8a4 100644
--- a/spec/frontend/diffs/components/tree_list_spec.js
+++ b/spec/frontend/diffs/components/tree_list_spec.js
@@ -233,6 +233,12 @@ describe('Diffs tree list component', () => {
       expect(getScroller().props('items')).toHaveLength(6);
     });
 
+    it('re-emits clickFile event', () => {
+      const obj = {};
+      wrapper.findComponent(DiffFileRow).vm.$emit('clickFile', obj);
+      expect(wrapper.emitted('clickFile')).toStrictEqual([[obj]]);
+    });
+
     it('hides file stats', () => {
       createComponent({ hideFileStats: true });
       expect(getFileRow().props('hideFileStats')).toBe(true);
diff --git a/spec/frontend/fixtures/pipeline_create.rb b/spec/frontend/fixtures/pipeline_create.rb
new file mode 100644
index 00000000000..9cb2e551195
--- /dev/null
+++ b/spec/frontend/fixtures/pipeline_create.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'GraphQL Pipeline Mutations', type: :request, feature_category: :pipeline_composition do
+  include ApiHelpers
+  include GraphqlHelpers
+  include JavaScriptFixturesHelpers
+
+  # Project setup
+  let_it_be(:namespace) { create(:namespace, name: 'frontend-fixtures') }
+  let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'pipelines-project') }
+  let_it_be(:user) { create(:user, developer_of: project) }
+
+  before_all do
+    project.add_developer(user)
+    # Ensure we have a valid repository with CI config
+    project.repository.create_file(
+      user,
+      '.gitlab-ci.yml',
+      'test:
+        script: echo "test"',
+      message: 'Add CI config',
+      branch_name: 'main'
+    )
+  end
+
+  before do
+    sign_in(user)
+  end
+
+  describe GraphQL::Query do
+    describe 'Pipeline Create Mutation' do
+      let_it_be(:query_file) { 'create_pipeline.mutation.graphql' }
+      let_it_be(:query_path) { "ci/pipeline_new/graphql/mutations/" }
+      let_it_be(:create_mutation) do
+        get_graphql_query_as_string("#{query_path}#{query_file}")
+      end
+
+      context 'with valid input' do
+        let(:input_variables) do
+          {
+            input: {
+              projectPath: project.full_path,
+              ref: 'main',
+              clientMutationId: 'test-mutation-id',
+              variables: [
+                {
+                  key: 'var_one',
+                  value: '',
+                  variableType: 'ENV_VAR'
+                }
+              ]
+            }
+          }
+        end
+
+        it 'graphql/pipelines/create_pipeline.mutation.graphql.json' do
+          post_graphql(create_mutation,
+            current_user: user,
+            variables: input_variables
+          )
+
+          expect_graphql_errors_to_be_empty
+        end
+      end
+
+      context 'with empty ref' do
+        let(:input_variables) do
+          {
+            input: {
+              projectPath: project.full_path,
+              ref: '',
+              clientMutationId: 'test-mutation-id',
+              variables: []
+            }
+          }
+        end
+
+        it 'graphql/pipelines/create_pipeline_error.mutation.graphql.json' do
+          post_graphql(create_mutation,
+            current_user: user,
+            variables: input_variables
+          )
+
+          expect(graphql_data.dig('pipelineCreate', 'errors')).not_to be_empty
+        end
+      end
+    end
+  end
+end
diff --git a/spec/frontend/fixtures/pipelines.rb b/spec/frontend/fixtures/pipelines.rb
index 1ee4c9d0e93..cc8b5f27c9a 100644
--- a/spec/frontend/fixtures/pipelines.rb
+++ b/spec/frontend/fixtures/pipelines.rb
@@ -72,64 +72,75 @@ RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :co
     expect(response).to be_successful
   end
 
-  describe GraphQL::Query, type: :request do # rubocop:disable RSpec/MultipleMemoizedHelpers -- new rule, will be fixed in follow-up
+  describe GraphQL::Query, type: :request do
     fixtures_path = 'graphql/pipelines/'
-    get_pipeline_actions_query = 'get_pipeline_actions.query.graphql'
-    get_pipeline_summary_query = 'get_pipeline_summary.query.graphql'
-    get_pipeline_iid_query = 'get_pipeline_iid.query.graphql'
+    let(:base_pipeline) { create(:ci_pipeline, project: project, sha: '0000') }
 
-    let!(:pipeline_with_manual_actions) { create(:ci_pipeline, project: project, user: user) }
-    let!(:pipeline_summary) { create(:ci_pipeline, project: project, finished_at: 1.hour.ago) }
-    let(:commit) { create(:commit, project: project) }
-
-    let!(:build_stage) do
-      create(:ci_stage, name: 'build', pipeline: pipeline_with_manual_actions, project:
-                                pipeline_with_manual_actions.project)
+    def queries
+      {
+        actions: get_graphql_query_as_string(
+          "ci/pipelines_page/graphql/queries/get_pipeline_actions.query.graphql"
+        ),
+        downstream_jobs: get_graphql_query_as_string(
+          "ci/pipeline_mini_graph/graphql/queries/get_downstream_pipeline_jobs.query.graphql"
+        ),
+        iid: get_graphql_query_as_string(
+          "ci/pipeline_editor/graphql/queries/get_pipeline_iid.query.graphql"
+        ),
+        summary: get_graphql_query_as_string(
+          "ci/common/pipeline_summary/graphql/queries/get_pipeline_summary.query.graphql"
+        )
+      }
     end
 
-    let!(:test_stage) do
-      create(:ci_stage, name: 'test', pipeline: pipeline_with_manual_actions, project:
-                               pipeline_with_manual_actions.project)
-    end
+    it "#{fixtures_path}get_pipeline_actions.query.graphql.json" do
+      stages = {
+        build: create(:ci_stage, name: 'build', pipeline: base_pipeline, project: base_pipeline.project),
+        test: create(:ci_stage, name: 'test', pipeline: base_pipeline, project: base_pipeline.project)
+      }
 
-    let!(:build_scheduled) do
-      create(:ci_build, :scheduled, pipeline: pipeline_with_manual_actions, ci_stage: test_stage)
-    end
+      create(:ci_build, :scheduled, pipeline: base_pipeline, ci_stage: stages[:test])
+      create(:ci_build, :manual, pipeline: base_pipeline, ci_stage: stages[:build])
+      create(:ci_build, :manual, :skipped, pipeline: base_pipeline, ci_stage: stages[:build])
 
-    let!(:build_manual) { create(:ci_build, :manual, pipeline: pipeline_with_manual_actions, ci_stage: build_stage) }
-    let!(:build_manual_cannot_play) do
-      create(:ci_build, :manual, :skipped, pipeline: pipeline_with_manual_actions, ci_stage: build_stage)
-    end
-
-    let_it_be(:query) do
-      get_graphql_query_as_string("ci/pipelines_page/graphql/queries/#{get_pipeline_actions_query}")
-    end
-
-    let_it_be(:pipeline_summary_query) do
-      get_graphql_query_as_string("ci/common/pipeline_summary/graphql/queries/#{get_pipeline_summary_query}")
-    end
-
-    let_it_be(:pipeline_iid_query) do
-      get_graphql_query_as_string("ci/pipeline_editor/graphql/queries/#{get_pipeline_iid_query}")
-    end
-
-    it "#{fixtures_path}#{get_pipeline_actions_query}.json" do
-      post_graphql(query, current_user: user,
-        variables: { fullPath: project.full_path, iid: pipeline_with_manual_actions.iid })
+      post_graphql(
+        queries[:actions],
+        current_user: user,
+        variables: { fullPath: project.full_path, iid: base_pipeline.iid }
+      )
 
       expect_graphql_errors_to_be_empty
     end
 
-    it "#{fixtures_path}#{get_pipeline_summary_query}.json" do
-      post_graphql(pipeline_summary_query, current_user: user,
-        variables: { fullPath: project.full_path, iid: pipeline_summary.iid, includeCommitInfo: true })
+    it "#{fixtures_path}get_downstream_pipeline_jobs.query.graphql.json" do
+      post_graphql(
+        queries[:downstream_jobs],
+        current_user: user,
+        variables: { fullPath: project.full_path, iid: base_pipeline.iid }
+      )
 
       expect_graphql_errors_to_be_empty
     end
 
-    it "#{fixtures_path}#{get_pipeline_iid_query}.json" do
-      post_graphql(pipeline_iid_query, current_user: user,
-        variables: { fullPath: project.full_path, sha: commit.sha })
+    it "#{fixtures_path}get_pipeline_iid.query.graphql.json" do
+      post_graphql(
+        queries[:iid],
+        current_user: user,
+        variables: { fullPath: project.full_path, sha: commit.sha }
+      )
+
+      expect_graphql_errors_to_be_empty
+    end
+
+    it "#{fixtures_path}get_pipeline_summary.query.graphql.json" do
+      commit = create(:commit, project: project)
+      base_pipeline.update!(sha: commit.id, user: user, finished_at: 1.hour.ago)
+
+      post_graphql(
+        queries[:summary],
+        current_user: user,
+        variables: { fullPath: project.full_path, iid: base_pipeline.iid, includeCommitInfo: true }
+      )
 
       expect_graphql_errors_to_be_empty
     end
diff --git a/spec/frontend/vue_shared/components/file_row_spec.js b/spec/frontend/vue_shared/components/file_row_spec.js
index 2abfb060355..a33cc165361 100644
--- a/spec/frontend/vue_shared/components/file_row_spec.js
+++ b/spec/frontend/vue_shared/components/file_row_spec.js
@@ -63,7 +63,7 @@ describe('File row component', () => {
     expect(wrapper.element.title.trim()).toEqual('');
   });
 
-  it('emits toggleTreeOpen on click', () => {
+  it('emits toggleTreeOpen on tree click', () => {
     const fileName = 't3';
     createComponent({
       file: {
@@ -78,6 +78,22 @@ describe('File row component', () => {
     expect(wrapper.emitted('toggleTreeOpen')[0][0]).toEqual(fileName);
   });
 
+  it('emits clickFile on blob click', () => {
+    const fileName = 't3';
+    const fileProp = {
+      ...file(fileName),
+      type: 'blob',
+    };
+    createComponent({
+      file: fileProp,
+      level: 1,
+    });
+
+    wrapper.element.click();
+
+    expect(wrapper.emitted('clickFile')[0][0]).toEqual(fileProp);
+  });
+
   it('calls scrollIntoView if made active', () => {
     createComponent({
       file: {
diff --git a/spec/frontend/vue_shared/components/topic_badges_spec.js b/spec/frontend/vue_shared/components/topic_badges_spec.js
index 69517911881..3a33a570a88 100644
--- a/spec/frontend/vue_shared/components/topic_badges_spec.js
+++ b/spec/frontend/vue_shared/components/topic_badges_spec.js
@@ -139,4 +139,17 @@ describe('Topic Badges', () => {
       });
     });
   });
+
+  describe('with relative url', () => {
+    beforeEach(() => {
+      gon.relative_url_root = '/gitlab/something//';
+      createComponent();
+    });
+
+    it('passes correct url prop to badge', () => {
+      expect(findFirstBadge().props('href')).toBe(
+        `/gitlab/something/explore/projects/topics/${defaultProps.topics[0]}`,
+      );
+    });
+  });
 });
diff --git a/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id_spec.rb
new file mode 100644
index 00000000000..ca3fab303f9
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_group_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillBulkImportExportBatchesGroupId,
+  feature_category: :importers,
+  schema: 20250205194216 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :bulk_import_export_batches }
+    let(:backfill_column) { :group_id }
+    let(:backfill_via_table) { :bulk_import_exports }
+    let(:backfill_via_column) { :group_id }
+    let(:backfill_via_foreign_key) { :export_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id_spec.rb
new file mode 100644
index 00000000000..e13fbba97e6
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_bulk_import_export_batches_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillBulkImportExportBatchesProjectId,
+  feature_category: :importers,
+  schema: 20250205194211 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :bulk_import_export_batches }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :bulk_import_exports }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :export_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb
new file mode 100644
index 00000000000..adb5307701a
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId,
+  feature_category: :source_code_management,
+  schema: 20250205200243 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :required_code_owners_sections }
+    let(:backfill_column) { :protected_branch_namespace_id }
+    let(:backfill_via_table) { :protected_branches }
+    let(:backfill_via_column) { :namespace_id }
+    let(:backfill_via_foreign_key) { :protected_branch_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id_spec.rb
new file mode 100644
index 00000000000..3f7f3437c02
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_required_code_owners_sections_protected_branch_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillRequiredCodeOwnersSectionsProtectedBranchProjectId,
+  feature_category: :source_code_management,
+  schema: 20250205200238 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :required_code_owners_sections }
+    let(:backfill_column) { :protected_branch_project_id }
+    let(:backfill_via_table) { :protected_branches }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :protected_branch_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb
new file mode 100644
index 00000000000..fcbc9cfdac2
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillSnippetRepositoryStorageMovesSnippetOrganizationId,
+  feature_category: :source_code_management,
+  schema: 20250205200744 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :snippet_repository_storage_moves }
+    let(:backfill_column) { :snippet_organization_id }
+    let(:backfill_via_table) { :snippets }
+    let(:backfill_via_column) { :organization_id }
+    let(:backfill_via_foreign_key) { :snippet_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb
new file mode 100644
index 00000000000..50adcc32f4c
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillSnippetRepositoryStorageMovesSnippetProjectId,
+  feature_category: :source_code_management,
+  schema: 20250205200739 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :snippet_repository_storage_moves }
+    let(:backfill_column) { :snippet_project_id }
+    let(:backfill_via_table) { :snippets }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :snippet_id }
+  end
+end
diff --git a/spec/migrations/20241114202257_queue_backfill_compliance_violation_null_target_project_ids_spec.rb b/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
similarity index 86%
rename from spec/migrations/20241114202257_queue_backfill_compliance_violation_null_target_project_ids_spec.rb
rename to spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
index 8e5f8bb82f5..ce3d0086842 100644
--- a/spec/migrations/20241114202257_queue_backfill_compliance_violation_null_target_project_ids_spec.rb
+++ b/spec/migrations/20250203155647_requeue_backfill_compliance_violation_null_target_project_ids_migration_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillComplianceViolationNullTargetProjectIds, migration: :gitlab_main, feature_category: :compliance_management do
+RSpec.describe RequeueBackfillComplianceViolationNullTargetProjectIdsMigration, migration: :gitlab_main, feature_category: :compliance_management do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do
diff --git a/spec/migrations/20250205194215_queue_backfill_bulk_import_export_batches_project_id_spec.rb b/spec/migrations/20250205194215_queue_backfill_bulk_import_export_batches_project_id_spec.rb
new file mode 100644
index 00000000000..645b694d702
--- /dev/null
+++ b/spec/migrations/20250205194215_queue_backfill_bulk_import_export_batches_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillBulkImportExportBatchesProjectId, feature_category: :importers do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :bulk_import_export_batches,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :project_id,
+            :bulk_import_exports,
+            :project_id,
+            :export_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20250205194220_queue_backfill_bulk_import_export_batches_group_id_spec.rb b/spec/migrations/20250205194220_queue_backfill_bulk_import_export_batches_group_id_spec.rb
new file mode 100644
index 00000000000..d6cca20a336
--- /dev/null
+++ b/spec/migrations/20250205194220_queue_backfill_bulk_import_export_batches_group_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillBulkImportExportBatchesGroupId, feature_category: :importers do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :bulk_import_export_batches,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :group_id,
+            :bulk_import_exports,
+            :group_id,
+            :export_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id_spec.rb b/spec/migrations/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id_spec.rb
new file mode 100644
index 00000000000..d1e177e70e0
--- /dev/null
+++ b/spec/migrations/20250205200242_queue_backfill_required_code_owners_sections_protected_branch_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillRequiredCodeOwnersSectionsProtectedBranchProjectId, feature_category: :source_code_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :required_code_owners_sections,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :protected_branch_project_id,
+            :protected_branches,
+            :project_id,
+            :protected_branch_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb b/spec/migrations/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb
new file mode 100644
index 00000000000..5702ba92b73
--- /dev/null
+++ b/spec/migrations/20250205200247_queue_backfill_required_code_owners_sections_protected_branch_namespace_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillRequiredCodeOwnersSectionsProtectedBranchNamespaceId, feature_category: :source_code_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :required_code_owners_sections,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :protected_branch_namespace_id,
+            :protected_branches,
+            :namespace_id,
+            :protected_branch_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb b/spec/migrations/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb
new file mode 100644
index 00000000000..99ddf85e8ab
--- /dev/null
+++ b/spec/migrations/20250205200743_queue_backfill_snippet_repository_storage_moves_snippet_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillSnippetRepositoryStorageMovesSnippetProjectId, feature_category: :source_code_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :snippet_repository_storage_moves,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :snippet_project_id,
+            :snippets,
+            :project_id,
+            :snippet_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb b/spec/migrations/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb
new file mode 100644
index 00000000000..680d29b2212
--- /dev/null
+++ b/spec/migrations/20250205200748_queue_backfill_snippet_repository_storage_moves_snippet_organization_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillSnippetRepositoryStorageMovesSnippetOrganizationId, feature_category: :source_code_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :snippet_repository_storage_moves,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :snippet_organization_id,
+            :snippets,
+            :organization_id,
+            :snippet_id
+          ]
+        )
+      }
+    end
+  end
+end