diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index 73c80e6fc8a..3e3eb09e285 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -95,6 +95,7 @@ qa:selectors:
 .pipeline-tier-base:
   extends:
     - .preflight-job-base
+  image: alpine:latest
   variables:
     GIT_STRATEGY: none
   script:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 66504979af3..430ade4c10c 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2962,6 +2962,8 @@
 
 .preflight:rules:pipeline-tier-1:
   rules:
+    - <<: *if-merge-request-labels-pipeline-expedite
+      when: never
     - <<: *if-merge-request-tier-1
       allow_failure: true
     - !reference [".prevent-tier-2-and-above", rules]
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index d5377d8d567..b8b7c45eae6 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -168,19 +168,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/diff/rendered/notebook/diff_file.rb'
     - 'lib/gitlab/diff/suggestions_parser.rb'
     - 'lib/gitlab/email/hook/delivery_metrics_observer.rb'
-    - 'rubocop/cop/rspec/modify_sidekiq_middleware.rb'
-    - 'scripts/packages/automated_cleanup.rb'
-    - 'scripts/rubocop-parse'
-    - 'sidekiq_cluster/sidekiq_cluster.rb'
-    - 'spec/benchmarks/banzai_benchmark.rb'
-    - 'spec/components/previews/pajamas/alert_component_preview.rb'
-    - 'spec/components/previews/pajamas/banner_component_preview.rb'
-    - 'spec/components/previews/pajamas/button_component_preview.rb'
-    - 'spec/graphql/features/authorization_spec.rb'
-    - 'spec/initializers/secret_token_spec.rb'
-    - 'spec/lib/api/every_api_endpoint_spec.rb'
-    - 'spec/lib/atlassian/jira_connect/client_spec.rb'
-    - 'spec/lib/backup/dump/postgres_spec.rb'
     - 'spec/lib/backup/manager_spec.rb'
     - 'spec/lib/bulk_imports/common/pipelines/lfs_objects_pipeline_spec.rb'
     - 'spec/lib/container_registry/blob_spec.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index c7b8b52de2c..90ea9ffdb63 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-bb9d396df20bb7abda6fac6bf155ae30b939e41f
+3c57fe552dc067f60db94b398d26592fcf4502c0
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 755bb64db30..707fa2b6314 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -575,17 +575,17 @@
 {"name":"rouge","version":"4.2.0","platform":"ruby","checksum":"60dd666b3a223467dc72f5b7384764dfd7ad4e50b0df9eff072be58123506eba"},
 {"name":"rqrcode","version":"2.2.0","platform":"ruby","checksum":"23eea88bb44c7ee6d6cab9354d08c287f7ebcdc6112e1fe7bcc2d010d1ffefc1"},
 {"name":"rqrcode_core","version":"1.2.0","platform":"ruby","checksum":"cf4989dc82d24e2877984738c4ee569308625fed2a810960f1b02d68d0308d1a"},
-{"name":"rspec","version":"3.12.0","platform":"ruby","checksum":"ccc41799a43509dc0be84070e3f0410ac95cbd480ae7b6c245543eb64162399c"},
+{"name":"rspec","version":"3.13.0","platform":"ruby","checksum":"d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993"},
 {"name":"rspec-benchmark","version":"0.6.0","platform":"ruby","checksum":"1014adb57ec2599a2455c63884229f367a2fff6a63a77fd68ce5d804c83dd6cf"},
-{"name":"rspec-core","version":"3.12.2","platform":"ruby","checksum":"155b54480f28e2b2813185077fe435c2d663031616360ed3b179a9d6a55d2551"},
-{"name":"rspec-expectations","version":"3.12.3","platform":"ruby","checksum":"093d18e2e7e0a2c619ef8f7343d442fc6c0793fb7897d56f16f26c8a9d244416"},
-{"name":"rspec-mocks","version":"3.12.6","platform":"ruby","checksum":"de51a4148ba2ce6f1c1646a2a03e9df2f52da9a42b164f2e7467b2cbe37e07bf"},
+{"name":"rspec-core","version":"3.13.0","platform":"ruby","checksum":"557792b4e88da883d580342b263d9652b6a10a12d5bda9ef967b01a48f15454c"},
+{"name":"rspec-expectations","version":"3.13.0","platform":"ruby","checksum":"621d48c62262f955421eaa418130744760802cad47e781df70dba4d9f897102e"},
+{"name":"rspec-mocks","version":"3.13.1","platform":"ruby","checksum":"087189899c337937bcf1d66a50dc3fc999ac88335bbeba4d385c2a38c87d7b38"},
 {"name":"rspec-parameterized","version":"1.0.2","platform":"ruby","checksum":"b456dec0091924175ac13963e173cdbaa2ab3e1581a405a948addc34e3f3f4c2"},
 {"name":"rspec-parameterized-core","version":"1.0.0","platform":"ruby","checksum":"287b494985e79821160af63aba4f91db8dbfa9a21cb200db34ba38f40e16ccc1"},
 {"name":"rspec-parameterized-table_syntax","version":"1.0.0","platform":"ruby","checksum":"d7df951eff9c5dd367ca7d5f9ae4853bb7ab7941f9d5b35bba361d112704988c"},
-{"name":"rspec-rails","version":"6.1.1","platform":"ruby","checksum":"bd949e61f89379f410ea1e43133163282f8d977c683ce6d10bf5aef6b1e995b2"},
+{"name":"rspec-rails","version":"6.1.2","platform":"ruby","checksum":"02874ab2e3b09001742af389c48739bed8706943e453afaea5e12614a83b990b"},
 {"name":"rspec-retry","version":"0.6.2","platform":"ruby","checksum":"6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858"},
-{"name":"rspec-support","version":"3.12.0","platform":"ruby","checksum":"dd4d44b247ff679b95b5607ac5641d197a5f9b1d33f916123cb98fc5f917c58b"},
+{"name":"rspec-support","version":"3.13.1","platform":"ruby","checksum":"48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f"},
 {"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"},
 {"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"},
 {"name":"rubocop","version":"1.62.1","platform":"ruby","checksum":"aeb1ec501aef5833617b3b6a1512303806218c349c28ce5b3ea72e3782ad4a35"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 225cdda511c..9de3cb335cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1525,23 +1525,23 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-benchmark (0.6.0)
       benchmark-malloc (~> 0.2)
       benchmark-perf (~> 0.6)
       benchmark-trend (~> 0.4)
       rspec (>= 3.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-parameterized (1.0.2)
       rspec-parameterized-core (< 2)
       rspec-parameterized-table_syntax (< 2)
@@ -1553,17 +1553,17 @@ GEM
     rspec-parameterized-table_syntax (1.0.0)
       binding_of_caller
       rspec-parameterized-core (< 2)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
+    rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rspec_profiling (0.0.9)
diff --git a/app/assets/javascripts/batch_comments/components/review_bar.vue b/app/assets/javascripts/batch_comments/components/review_bar.vue
index 365b7930dd3..52de35ba0df 100644
--- a/app/assets/javascripts/batch_comments/components/review_bar.vue
+++ b/app/assets/javascripts/batch_comments/components/review_bar.vue
@@ -39,7 +39,7 @@ export default {
   <div>
     <nav class="review-bar-component js-review-bar" data-testid="review_bar_component">
       <div
-        class="review-bar-content d-flex gl-justify-content-end"
+        class="review-bar-content gl-flex gl-justify-content-end"
         data-testid="review-bar-content"
       >
         <preview-dropdown />
diff --git a/app/assets/javascripts/blob/components/blob_header_filepath.vue b/app/assets/javascripts/blob/components/blob_header_filepath.vue
index 331295042d7..dcfb1e8e7b2 100644
--- a/app/assets/javascripts/blob/components/blob_header_filepath.vue
+++ b/app/assets/javascripts/blob/components/blob_header_filepath.vue
@@ -42,7 +42,7 @@ export default {
 };
 </script>
 <template>
-  <div class="file-header-content d-flex gl-align-items-center gl-leading-1">
+  <div class="file-header-content gl-flex gl-align-items-center gl-leading-1">
     <slot name="filepath-prepend"></slot>
 
     <template v-if="fileName">
diff --git a/app/assets/javascripts/ci/pipelines_page/tokens/pipeline_trigger_author_token.vue b/app/assets/javascripts/ci/pipelines_page/tokens/pipeline_trigger_author_token.vue
index 20c5e1557a7..afeb8fc5314 100644
--- a/app/assets/javascripts/ci/pipelines_page/tokens/pipeline_trigger_author_token.vue
+++ b/app/assets/javascripts/ci/pipelines_page/tokens/pipeline_trigger_author_token.vue
@@ -96,7 +96,7 @@ export default {
           :key="user.username"
           :value="user.username"
         >
-          <div class="d-flex">
+          <div class="gl-flex">
             <gl-avatar :size="32" :src="user.avatar_url" />
             <div>
               <div>{{ user.name }}</div>
diff --git a/app/assets/javascripts/clusters/forms/components/integration_form.vue b/app/assets/javascripts/clusters/forms/components/integration_form.vue
index 25669e4fd0c..1c5032e886a 100644
--- a/app/assets/javascripts/clusters/forms/components/integration_form.vue
+++ b/app/assets/javascripts/clusters/forms/components/integration_form.vue
@@ -63,9 +63,9 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex gl-flex-direction-column">
+  <div class="gl-flex gl-flex-direction-column">
     <gl-form-group>
-      <div class="gl-display-flex gl-align-items-center">
+      <div class="gl-flex gl-align-items-center">
         <h4 class="gl-pr-3 gl-m-0">{{ s__('ClusterIntegration|GitLab Integration') }}</h4>
 
         <div class="js-cluster-enable-toggle-area">
@@ -136,7 +136,7 @@ export default {
         </gl-sprintf>
       </div>
     </gl-form-group>
-    <div v-if="editable" class="form group gl-display-flex gl-justify-content-end">
+    <div v-if="editable" class="form group gl-flex gl-justify-content-end">
       <gl-button
         category="primary"
         variant="confirm"
diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/render.js b/app/assets/javascripts/deprecated_jquery_dropdown/render.js
index 1b133c57302..a647f7a6f5f 100644
--- a/app/assets/javascripts/deprecated_jquery_dropdown/render.js
+++ b/app/assets/javascripts/deprecated_jquery_dropdown/render.js
@@ -105,7 +105,7 @@ function createLink(data, selected, options, index) {
   link.href = getPropertyWithDefault(data, options, 'url', '#');
 
   if (options.icon) {
-    link.classList.add('d-flex', 'align-items-center');
+    link.classList.add('gl-flex', 'align-items-center');
   }
 
   if (options.trackSuggestionClickedLabel) {
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 392114f43a0..70b8684f988 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -754,7 +754,7 @@ export default {
 
       <div
         :data-can-create-note="getNoteableData.current_user.can_create_note"
-        class="files d-flex gl-mt-2"
+        class="files gl-flex gl-mt-2"
       >
         <diffs-file-tree :visible="renderFileTree" @toggled="fileTreeToggled" />
         <div class="col-12 col-md-auto diff-files-holder">
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index 1d20a97fed1..e9c2adf54ed 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -117,7 +117,7 @@ export default {
         </gl-button-group>
       </div>
       <div>
-        <div class="d-flex float-left gl-align-items-center align-self-start">
+        <div class="gl-flex float-left gl-items-center align-self-start">
           <gl-form-checkbox
             v-if="isSelectable"
             :checked="checked"
diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue
index 3cc343e99bd..f295f9fdd10 100644
--- a/app/assets/javascripts/diffs/components/compare_versions.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions.vue
@@ -190,7 +190,7 @@ export default {
       </div>
       <gl-sprintf
         v-else-if="!commit && hasSourceVersions"
-        class="d-flex gl-align-items-center compare-versions-container"
+        class="gl-flex gl-items-center compare-versions-container"
         :message="s__('MergeRequest|Compare %{target} and %{source}')"
       >
         <template #target>
diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
index 4de38b09be6..7beb88d9bb1 100644
--- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
+++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
@@ -36,7 +36,7 @@ export default {
 </script>
 
 <template>
-  <div class="discussion-reply-holder d-flex clearfix">
+  <div class="discussion-reply-holder gl-flex clearfix">
     <template v-if="userCanReply">
       <slot v-if="hasForm" name="form"></slot>
       <template v-else-if="renderReplyPlaceholder">
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 8f5dcb64c8a..06a7d8c9512 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -381,7 +381,7 @@ export default {
 
     <div
       v-if="!diffFile.submodule && addMergeRequestButtons"
-      class="file-actions d-flex gl-align-items-center gl-ml-auto gl-align-self-start"
+      class="file-actions gl-flex gl-items-center gl-ml-auto gl-align-self-start"
     >
       <diff-stats
         :diff-file="diffFile"
@@ -392,7 +392,7 @@ export default {
         v-if="isReviewable && showLocalFileReviews"
         v-gl-tooltip.hover.focus.left
         data-testid="fileReviewCheckbox"
-        class="gl-mr-5 -gl-mb-3 gl-display-flex gl-align-items-center"
+        class="gl-mr-5 -gl-mb-3 gl-flex gl-items-center"
         :title="$options.i18n.fileReviewTooltip"
         :checked="reviewed"
         @change="toggleReview"
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue
index 5405f904527..4128f2814ba 100644
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@@ -150,8 +150,8 @@ export default {
 </script>
 
 <template>
-  <div class="tree-list-holder d-flex flex-column" data-testid="file-tree-container">
-    <div class="gl-display-flex gl-align-items-center gl-mb-3">
+  <div class="tree-list-holder gl-flex flex-column" data-testid="file-tree-container">
+    <div class="gl-flex gl-items-center gl-mb-3">
       <h5 class="gl-display-inline-block gl-my-0">{{ __('Files') }}</h5>
       <gl-badge size="sm" class="gl-ml-2" data-testid="file-count">{{ realSize }}</gl-badge>
       <gl-button-group class="gl-ml-auto">
diff --git a/app/assets/javascripts/environments/components/deploy_board.vue b/app/assets/javascripts/environments/components/deploy_board.vue
index ce7a6f0abe7..7030efacea0 100644
--- a/app/assets/javascripts/environments/components/deploy_board.vue
+++ b/app/assets/javascripts/environments/components/deploy_board.vue
@@ -161,11 +161,11 @@ export default {
                 <gl-icon class="gl-text-blue-500 gl-ml-2" name="question-o" />
               </span>
               <gl-tooltip :target="() => $refs['legend-icon']" boundary="#content-body">
-                <div class="deploy-board-legend gl-display-flex gl-flex-direction-column">
+                <div class="deploy-board-legend gl-flex gl-flex-direction-column">
                   <div
                     v-for="status in statuses"
                     :key="status.text"
-                    class="gl-display-flex gl-align-items-center"
+                    class="gl-flex gl-items-center"
                   >
                     <instance-component :status="status.class" :stable="status.stable" />
                     <span class="legend-text gl-ml-3">{{ status.text }}</span>
@@ -174,7 +174,7 @@ export default {
               </gl-tooltip>
             </div>
 
-            <div class="deploy-board-instances-container d-flex flex-wrap flex-row">
+            <div class="deploy-board-instances-container gl-flex flex-wrap flex-row">
               <template v-for="(instance, i) in deployBoardData.instances">
                 <instance-component
                   :key="i"
@@ -220,7 +220,7 @@ export default {
         <section v-safe-html="deployBoardSvg" class="deploy-board-empty-state-svg"></section>
 
         <section class="deploy-board-empty-state-text">
-          <span class="deploy-board-empty-state-title d-flex">{{
+          <span class="deploy-board-empty-state-title gl-flex">{{
             __('Kubernetes deployment not found')
           }}</span>
           <span>
diff --git a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
index dc882c3ccb4..1ef74c81a99 100644
--- a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
+++ b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
@@ -81,7 +81,7 @@ export default {
 <template>
   <div class="file-holder">
     <div ref="header" class="file-title file-title-flex-parent">
-      <div class="file-header-content d-flex align-content-center gl-flex-wrap overflow-hidden">
+      <div class="file-header-content gl-flex align-content-center gl-flex-wrap overflow-hidden">
         <div v-if="hasCode" class="gl-inline-block cursor-pointer" @click="toggle()">
           <gl-icon :name="collapseIcon" :size="16" class="gl-mr-2" />
         </div>
diff --git a/app/assets/javascripts/feature_flags/components/feature_flags_table.vue b/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
index 73a4d338d1c..321a3819a5e 100644
--- a/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
+++ b/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
@@ -157,9 +157,9 @@ export default {
             {{ s__('FeatureFlags|Feature flag') }}
           </div>
           <div
-            class="table-mobile-content gl-text-left gl-display-flex flex-column js-feature-flag-title gl-mr-5"
+            class="table-mobile-content gl-text-left gl-flex flex-column js-feature-flag-title gl-mr-5"
           >
-            <div class="gl-display-flex gl-align-items-center">
+            <div class="gl-flex gl-align-items-center">
               <div class="feature-flag-name text-monospace text-wrap gl-break-anywhere">
                 {{ featureFlag.name }}
               </div>
@@ -180,7 +180,7 @@ export default {
             {{ s__('FeatureFlags|Environment Specs') }}
           </div>
           <div
-            class="table-mobile-content gl-text-left d-flex gl-flex-wrap justify-content-end justify-content-md-start js-feature-flag-environments"
+            class="table-mobile-content gl-text-left gl-flex gl-flex-wrap justify-content-end justify-content-md-start js-feature-flag-environments"
           >
             <strategy-label
               v-for="strategy in featureFlag.strategies"
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 86e3cf40576..54635cf7094 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -159,9 +159,9 @@ export default {
   >
     <div
       :class="{ 'project-row-contents': !isGroup }"
-      class="group-row-contents d-flex gl-align-items-center py-2 pr-3"
+      class="group-row-contents gl-flex gl-items-center py-2 pr-3"
     >
-      <div class="folder-toggle-wrap gl-mr-2 d-flex gl-align-items-center">
+      <div class="folder-toggle-wrap gl-mr-2 !gl-flex gl-items-center">
         <gl-button
           v-if="hasChildren"
           :aria-label="toggleAriaLabel"
@@ -180,7 +180,7 @@ export default {
         class="gl-hidden sm:gl-inline-flex flex-shrink-0 gl-mr-3"
       />
       <a
-        :class="{ 'gl-sm-display-flex': !group.isChildrenLoading }"
+        :class="{ 'sm:gl-flex': !group.isChildrenLoading }"
         class="gl-hidden gl-text-decoration-none! gl-mr-3"
         :href="group.relativePath"
         :aria-label="group.name"
@@ -193,10 +193,10 @@ export default {
           :project-name="group.name"
         />
       </a>
-      <div class="group-text-container d-flex flex-fill gl-align-items-center">
+      <div class="group-text-container !gl-flex flex-fill gl-align-items-center">
         <div class="group-text flex-grow-1 flex-shrink-1">
           <div
-            class="gl-display-flex gl-align-items-center gl-flex-wrap title namespace-title gl-font-bold gl-mr-3"
+            class="gl-flex gl-align-items-center gl-flex-wrap title namespace-title gl-font-bold gl-mr-3"
           >
             <a
               v-gl-tooltip.bottom
@@ -266,7 +266,7 @@ export default {
           <gl-badge variant="info">{{ __('Archived') }}</gl-badge>
         </div>
         <div
-          class="metadata gl-display-flex gl-flex-grow-1 gl-flex-shrink-0 gl-flex-wrap justify-content-md-between"
+          class="metadata gl-flex gl-flex-grow-1 gl-flex-shrink-0 gl-flex-wrap justify-content-md-between"
         >
           <item-stats
             :item="group"
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue
index f654e349119..ef675a9d89a 100644
--- a/app/assets/javascripts/groups/components/groups.vue
+++ b/app/assets/javascripts/groups/components/groups.vue
@@ -45,7 +45,7 @@ export default {
     <pagination-links
       :change="change"
       :page-info="pageInfo"
-      class="d-flex justify-content-center gl-mt-3"
+      class="!gl-flex justify-content-center gl-mt-3"
     />
   </div>
 </template>
diff --git a/app/assets/javascripts/ide/components/branches/item.vue b/app/assets/javascripts/ide/components/branches/item.vue
index 0693e5ad5c3..8ed9f34ee93 100644
--- a/app/assets/javascripts/ide/components/branches/item.vue
+++ b/app/assets/javascripts/ide/components/branches/item.vue
@@ -33,8 +33,8 @@ export default {
 </script>
 
 <template>
-  <a :href="branchHref" class="btn-link d-flex gl-align-items-center">
-    <span class="d-flex gl-mr-3 ide-search-list-current-icon">
+  <a :href="branchHref" class="btn-link gl-flex gl-items-center">
+    <span class="gl-flex gl-mr-3 ide-search-list-current-icon">
       <gl-icon v-if="isActive" :size="16" name="mobile-issue-close" />
     </span>
     <span>
diff --git a/app/assets/javascripts/ide/components/branches/search_list.vue b/app/assets/javascripts/ide/components/branches/search_list.vue
index 35fb865984a..66b966bda95 100644
--- a/app/assets/javascripts/ide/components/branches/search_list.vue
+++ b/app/assets/javascripts/ide/components/branches/search_list.vue
@@ -72,7 +72,7 @@ export default {
       />
       <gl-icon name="search" class="gl-ml-5 gl-mt-1 input-icon" />
     </label>
-    <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
+    <div class="dropdown-content ide-merge-requests-dropdown-content !gl-flex">
       <gl-loading-icon
         v-if="isLoading"
         size="lg"
@@ -84,10 +84,7 @@ export default {
             <item :item="item" :project-id="currentProjectId" :is-active="isActiveBranch(item)" />
           </li>
         </template>
-        <li
-          v-else
-          class="ide-search-list-empty d-flex gl-align-items-center justify-content-center"
-        >
+        <li v-else class="ide-search-list-empty !gl-flex gl-items-center gl-justify-center">
           <template v-if="hasNoSearchResults">
             {{ __('No branches found') }}
           </template>
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index b733e0eb3ba..ee7cab5fff1 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -86,15 +86,15 @@ export default {
       role="button"
       @click="openFileInEditor"
     >
-      <span class="multi-file-commit-list-file-path d-flex gl-align-items-center">
+      <span class="multi-file-commit-list-file-path !gl-flex gl-items-center">
         <file-icon :file-name="file.name" class="gl-mr-3" />
         <template v-if="file.prevName && file.prevName !== file.name">
           {{ file.prevName }} &#x2192;
         </template>
         {{ file.name }}
       </span>
-      <div class="ml-auto d-flex gl-align-items-center">
-        <div class="d-flex gl-align-items-center ide-commit-list-changed-icon">
+      <div class="ml-auto gl-flex gl-items-center">
+        <div class="gl-flex gl-items-center ide-commit-list-changed-icon">
           <gl-icon :name="iconName" :size="16" :class="iconClass" />
         </div>
       </div>
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index a850d37c4c0..bc84a63d4ed 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -134,7 +134,7 @@ export default {
 
 <template>
   <article
-    class="ide position-relative d-flex flex-column align-items-stretch"
+    class="ide position-relative gl-flex flex-column align-items-stretch"
     :class="{ [`theme-${themeName}`]: themeName }"
   >
     <cannot-push-code-alert
@@ -143,7 +143,7 @@ export default {
       :action="canPushCodeStatus.action"
     />
     <error-message v-if="errorMessage" :message="errorMessage" />
-    <div class="ide-view flex-grow d-flex">
+    <div class="ide-view flex-grow gl-flex">
       <template v-if="loadDeferred">
         <find-file
           :files="allBlobs"
diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue
index d422c7c00d9..93b610da65f 100644
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_side_bar.vue
@@ -45,7 +45,7 @@ export default {
     </template>
     <template v-else>
       <ide-project-header :project="currentProject" />
-      <div class="ide-context-body d-flex flex-fill">
+      <div class="ide-context-body gl-flex flex-fill">
         <activity-bar />
         <div class="multi-file-commit-panel-inner" data-testid="ide-side-bar-inner">
           <div class="multi-file-commit-panel-inner-content">
diff --git a/app/assets/javascripts/ide/components/ide_status_list.vue b/app/assets/javascripts/ide/components/ide_status_list.vue
index bd61625a530..26e96aedce0 100644
--- a/app/assets/javascripts/ide/components/ide_status_list.vue
+++ b/app/assets/javascripts/ide/components/ide_status_list.vue
@@ -27,7 +27,7 @@ export default {
 </script>
 
 <template>
-  <div class="ide-status-list d-flex">
+  <div class="ide-status-list gl-flex">
     <template v-if="activeFile">
       <div>
         <gl-link v-gl-tooltip.hover :href="activeFile.permalink" :title="__('Open in file view')">
diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue
index 02cb9f4e78c..10b752851b0 100644
--- a/app/assets/javascripts/ide/components/jobs/detail.vue
+++ b/app/assets/javascripts/ide/components/jobs/detail.vue
@@ -77,13 +77,13 @@ export default {
 </script>
 
 <template>
-  <div class="ide-pipeline build-page d-flex flex-column flex-fill">
-    <header class="ide-job-header d-flex gl-align-items-center">
+  <div class="ide-pipeline build-page gl-flex flex-column flex-fill">
+    <header class="ide-job-header gl-flex gl-items-center">
       <gl-button category="secondary" icon="chevron-left" size="small" @click="setDetailJob(null)">
         {{ __('View jobs') }}
       </gl-button>
     </header>
-    <div class="top-bar d-flex border-left-0 mr-3">
+    <div class="top-bar gl-flex border-left-0 mr-3">
       <job-description :job="detailJob" />
       <div class="controllers ml-auto">
         <a
diff --git a/app/assets/javascripts/ide/components/jobs/detail/description.vue b/app/assets/javascripts/ide/components/jobs/detail/description.vue
index b30a651b38a..e2d08c62418 100644
--- a/app/assets/javascripts/ide/components/jobs/detail/description.vue
+++ b/app/assets/javascripts/ide/components/jobs/detail/description.vue
@@ -23,11 +23,8 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex gl-align-items-center">
-    <ci-icon
-      :status="job.status"
-      class="gl-align-items-center gl-border gl-display-inline-flex gl-z-1"
-    />
+  <div class="gl-flex gl-items-center">
+    <ci-icon :status="job.status" class="gl-items-center gl-border gl-inline-flex gl-z-1" />
     <span class="gl-ml-3">
       {{ job.name }}
       <a
diff --git a/app/assets/javascripts/ide/components/merge_requests/item.vue b/app/assets/javascripts/ide/components/merge_requests/item.vue
index 80b1612c6c5..5e05db2c87b 100644
--- a/app/assets/javascripts/ide/components/merge_requests/item.vue
+++ b/app/assets/javascripts/ide/components/merge_requests/item.vue
@@ -40,8 +40,8 @@ export default {
 </script>
 
 <template>
-  <a :href="mergeRequestHref" class="btn-link d-flex gl-align-items-center">
-    <span class="d-flex gl-mr-3 ide-search-list-current-icon">
+  <a :href="mergeRequestHref" class="btn-link gl-flex gl-items-center">
+    <span class="gl-flex gl-mr-3 ide-search-list-current-icon">
       <gl-icon v-if="isActive" :size="16" name="mobile-issue-close" />
     </span>
     <span>
diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue
index f09ce3fc96d..28c2cece2af 100644
--- a/app/assets/javascripts/ide/components/merge_requests/list.vue
+++ b/app/assets/javascripts/ide/components/merge_requests/list.vue
@@ -91,7 +91,7 @@ export default {
       />
       <gl-icon :size="16" name="search" class="ml-3 input-icon" />
     </label>
-    <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
+    <div class="dropdown-content ide-merge-requests-dropdown-content gl-flex">
       <gl-loading-icon
         v-if="isLoading"
         size="lg"
@@ -103,10 +103,10 @@ export default {
             <li v-for="searchType in $options.searchTypes" :key="searchType.type">
               <button
                 type="button"
-                class="btn-link d-flex gl-align-items-center"
+                class="btn-link gl-flex gl-items-center"
                 @click.stop="setSearchType(searchType)"
               >
-                <span class="d-flex gl-mr-3 ide-search-list-current-icon">
+                <span class="gl-flex gl-mr-3 ide-search-list-current-icon">
                   <gl-icon :size="16" name="search" />
                 </span>
                 <span>{{ searchType.label }}</span>
@@ -122,10 +122,7 @@ export default {
               />
             </li>
           </template>
-          <li
-            v-else
-            class="ide-search-list-empty d-flex gl-align-items-center justify-content-center"
-          >
+          <li v-else class="ide-search-list-empty gl-flex gl-items-center justify-content-center">
             {{ __('No merge requests found') }}
           </li>
         </ul>
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index 5e71470f383..9124be95f81 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -60,12 +60,12 @@ export default {
       :class="{
         show: isOpen,
       }"
-      class="dropdown d-flex"
+      class="dropdown gl-flex"
     >
       <button
         :aria-label="__('Create new file or directory')"
         type="button"
-        class="rounded border-0 d-flex ide-entry-dropdown-toggle"
+        class="rounded border-0 gl-flex ide-entry-dropdown-toggle"
         @click.stop="openDropdown()"
       >
         <gl-icon name="ellipsis_v" />
@@ -75,7 +75,7 @@ export default {
           <li>
             <item-button
               :label="__('New file')"
-              class="d-flex"
+              class="gl-flex"
               icon="doc-new"
               icon-classes="mr-2"
               @click="createNewItem('blob')"
@@ -85,7 +85,7 @@ export default {
           <li>
             <item-button
               :label="__('New directory')"
-              class="d-flex"
+              class="gl-flex"
               icon="folder-new"
               icon-classes="mr-2"
               @click="createNewItem($options.modalTypes.tree)"
@@ -96,7 +96,7 @@ export default {
         <li>
           <item-button
             :label="__('Rename/Move')"
-            class="d-flex"
+            class="gl-flex"
             icon="pencil"
             icon-classes="mr-2"
             @click="createNewItem($options.modalTypes.rename)"
@@ -105,7 +105,7 @@ export default {
         <li>
           <item-button
             :label="__('Delete')"
-            class="d-flex"
+            class="gl-flex"
             icon="remove"
             icon-classes="mr-2"
             @click="deleteEntry(path)"
diff --git a/app/assets/javascripts/ide/components/new_dropdown/upload.vue b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
index 69cf5c9b252..ee76c3e9673 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/upload.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
@@ -72,7 +72,7 @@ export default {
       :show-label="showLabel"
       :icon-classes="showLabel ? 'mr-2' : ''"
       :label="__('Upload file')"
-      class="d-flex"
+      class="gl-flex"
       icon="upload"
       @click="startFileUpload"
     />
diff --git a/app/assets/javascripts/ide/components/terminal/session.vue b/app/assets/javascripts/ide/components/terminal/session.vue
index 4931a7b3e94..f7e09d829f6 100644
--- a/app/assets/javascripts/ide/components/terminal/session.vue
+++ b/app/assets/javascripts/ide/components/terminal/session.vue
@@ -39,8 +39,8 @@ export default {
 </script>
 
 <template>
-  <div v-if="session" class="ide-terminal d-flex flex-column">
-    <header class="ide-job-header d-flex gl-align-items-center">
+  <div v-if="session" class="ide-terminal gl-flex flex-column">
+    <header class="ide-job-header gl-flex gl-items-center">
       <h5>{{ __('Web Terminal') }}</h5>
       <div class="ml-auto align-self-center">
         <gl-button
diff --git a/app/assets/javascripts/ide/components/terminal/terminal.vue b/app/assets/javascripts/ide/components/terminal/terminal.vue
index f066ce03385..14d9aeb4f9b 100644
--- a/app/assets/javascripts/ide/components/terminal/terminal.vue
+++ b/app/assets/javascripts/ide/components/terminal/terminal.vue
@@ -93,8 +93,8 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex flex-column flex-fill min-height-0 pr-3">
-    <div class="top-bar d-flex border-left-0 gl-align-items-center">
+  <div class="gl-flex flex-column flex-fill min-height-0 pr-3">
+    <div class="top-bar gl-flex border-left-0 gl-items-center">
       <div v-if="loadingText">
         <gl-loading-icon size="sm" :inline="true" />
         <span>{{ loadingText }}</span>
@@ -108,7 +108,7 @@ export default {
         @scroll-down="glterminal.scrollToBottom()"
       />
     </div>
-    <div class="terminal-wrapper d-flex flex-fill min-height-0">
+    <div class="terminal-wrapper gl-flex flex-fill min-height-0">
       <div
         ref="terminal"
         class="ide-terminal-trace flex-fill min-height-0 gl-w-full"
diff --git a/app/assets/javascripts/ide/components/terminal/view.vue b/app/assets/javascripts/ide/components/terminal/view.vue
index 9a9f947b5a5..ec133a6c4ef 100644
--- a/app/assets/javascripts/ide/components/terminal/view.vue
+++ b/app/assets/javascripts/ide/components/terminal/view.vue
@@ -25,7 +25,7 @@ export default {
 
 <template>
   <div class="gl-h-full">
-    <div v-if="isShowSplash" class="gl-h-full d-flex flex-column justify-content-center">
+    <div v-if="isShowSplash" class="gl-h-full gl-flex flex-column justify-content-center">
       <empty-state
         :is-loading="allCheck.isLoading"
         :is-valid="allCheck.isValid"
diff --git a/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue b/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue
index 301300b0460..9b0c194b6ba 100644
--- a/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue
+++ b/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue
@@ -62,13 +62,7 @@ export default {
 </script>
 
 <template>
-  <div
-    v-if="status"
-    v-gl-tooltip
-    :title="status.text"
-    role="note"
-    class="d-flex gl-align-items-center"
-  >
+  <div v-if="status" v-gl-tooltip :title="status.text" role="note" class="gl-flex gl-items-center">
     <span>{{ __('Terminal') }}:</span>
     <span class="square s16 d-flex-center ml-1" :aria-label="status.text">
       <gl-loading-icon v-if="isLoading" inline size="sm" class="d-flex-center" />
diff --git a/app/assets/javascripts/issuable/popover/components/mr_popover.vue b/app/assets/javascripts/issuable/popover/components/mr_popover.vue
index df2f2f93944..0f66faa2fdf 100644
--- a/app/assets/javascripts/issuable/popover/components/mr_popover.vue
+++ b/app/assets/javascripts/issuable/popover/components/mr_popover.vue
@@ -94,7 +94,7 @@ export default {
       <gl-skeleton-loader v-if="$apollo.queries.mergeRequest.loading" :height="15">
         <rect width="250" height="15" rx="4" />
       </gl-skeleton-loader>
-      <div v-else-if="showDetails" class="d-flex gl-align-items-center justify-content-between">
+      <div v-else-if="showDetails" class="gl-flex gl-align-items-center gl-justify-between">
         <div class="gl-inline-flex gl-align-items-center">
           <gl-badge class="gl-mr-2" :variant="badgeVariant">
             {{ stateHumanName }}
diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue
index a80deba35d7..f642c341a85 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_form.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue
@@ -342,7 +342,7 @@ export default {
         {{ __('Load more users') }}
       </gl-button>
 
-      <div class="footer-block row-content-block d-flex justify-content-between">
+      <div class="footer-block row-content-block gl-flex justify-content-between">
         <gl-button
           type="submit"
           category="primary"
diff --git a/app/assets/javascripts/labels/labels_select.js b/app/assets/javascripts/labels/labels_select.js
index db1dbc72624..ce3f74fbc21 100644
--- a/app/assets/javascripts/labels/labels_select.js
+++ b/app/assets/javascripts/labels/labels_select.js
@@ -241,7 +241,7 @@ export default class LabelsSelect {
 
           // We need to identify which items are actually labels
           if (label.id) {
-            const selectedLayoutClasses = ['d-flex', 'flex-row', 'text-break-word'];
+            const selectedLayoutClasses = ['gl-flex', 'flex-row', 'text-break-word'];
             selectedClass.push('label-item', ...selectedLayoutClasses);
             linkEl.dataset.labelId = label.id;
           }
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
index ad05e349d37..c98db96f600 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
@@ -131,7 +131,7 @@ export default {
                   category="tertiary"
                 />
               </div>
-              <div class="file-actions d-flex gl-align-items-center gl-ml-auto gl-align-self-start">
+              <div class="file-actions gl-flex gl-items-center gl-ml-auto gl-align-self-start">
                 <gl-button-group v-if="file.type === 'text'" class="gl-mr-3">
                   <gl-button
                     :selected="file.resolveMode === 'interactive'"
diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue
index 018b820a8fc..2b7281b0754 100644
--- a/app/assets/javascripts/releases/components/app_edit_new.vue
+++ b/app/assets/javascripts/releases/components/app_edit_new.vue
@@ -172,7 +172,7 @@ export default {
 };
 </script>
 <template>
-  <div class="d-flex flex-column">
+  <div class="gl-flex flex-column">
     <p class="pt-3 js-subtitle-text">
       <gl-sprintf
         :message="
@@ -262,7 +262,7 @@ export default {
 
       <asset-links-form />
 
-      <div class="d-flex gl-gap-x-3 pt-3">
+      <div class="gl-flex gl-gap-x-3 pt-3">
         <gl-button
           class="js-no-auto-disable"
           category="primary"
diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue
index b803d11c0d5..955b0a7ddf5 100644
--- a/app/assets/javascripts/releases/components/asset_links_form.vue
+++ b/app/assets/javascripts/releases/components/asset_links_form.vue
@@ -100,7 +100,7 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex flex-column release-assets-links-form">
+  <div class="gl-flex flex-column release-assets-links-form">
     <h2 class="text-4">{{ __('Release assets') }}</h2>
     <p class="m-0">
       <gl-sprintf
@@ -132,7 +132,7 @@ export default {
     <div
       v-for="(link, index) in release.assets.links"
       :key="link.id"
-      class="gl-sm-display-flex flex-column flex-sm-row gl-gap-5 align-items-stretch align-items-sm-start no-gutters"
+      class="sm:gl-flex flex-column flex-sm-row gl-gap-5 align-items-stretch align-items-sm-start no-gutters"
     >
       <gl-form-group
         class="url-field form-group col"
@@ -224,7 +224,7 @@ export default {
           :title="__('Remove asset link')"
           @click="onRemoveClicked(link.id)"
         >
-          <div class="d-flex">
+          <div class="gl-flex">
             <gl-icon class="mr-1 mr-sm-0" :size="16" name="remove" />
             <span class="d-inline d-sm-none">{{ __('Remove asset link') }}</span>
           </div>
diff --git a/app/assets/javascripts/releases/components/evidence_block.vue b/app/assets/javascripts/releases/components/evidence_block.vue
index 51f62a7ced5..fadaa8ba366 100644
--- a/app/assets/javascripts/releases/components/evidence_block.vue
+++ b/app/assets/javascripts/releases/components/evidence_block.vue
@@ -61,10 +61,10 @@ export default {
   <div>
     <h3 class="gl-heading-5 gl-mb-2!">{{ __('Evidence collection') }}</h3>
     <div v-for="(evidence, index) in evidences" :key="evidenceTitle(index)">
-      <div class="gl-display-flex gl-align-items-center">
+      <div class="gl-flex gl-items-center">
         <gl-link
           v-gl-tooltip
-          class="gl-display-flex gl-align-items-center gl-font-monospace"
+          class="gl-flex gl-items-center gl-font-monospace"
           target="_blank"
           :title="__('Open evidence JSON in new tab')"
           :href="evidenceUrl(index)"
@@ -74,7 +74,7 @@ export default {
           <gl-icon name="external-link" class="gl-ml-2 gl-flex-shrink-0 gl-flex-grow-0" />
         </gl-link>
 
-        <expand-button class="gl-display-flex gl-align-items-center gl-gap-2 gl-ml-4">
+        <expand-button class="gl-flex gl-items-center gl-gap-2 gl-ml-4">
           <template #short>
             <span class="js-short gl-font-monospace gl-text-secondary">{{ shortSha(index) }}</span>
           </template>
@@ -85,7 +85,7 @@ export default {
         <clipboard-button :title="__('Copy evidence SHA')" :text="sha(index)" category="tertiary" />
       </div>
 
-      <div class="gl-display-flex gl-align-items-center gl-text-secondary">
+      <div class="gl-flex gl-items-center gl-text-secondary">
         <gl-icon
           v-gl-tooltip
           name="clock"
diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue
index a4dd4705c4b..aef561dc942 100644
--- a/app/assets/javascripts/releases/components/release_block_header.vue
+++ b/app/assets/javascripts/releases/components/release_block_header.vue
@@ -48,9 +48,9 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-align-items-center gl-justify-content-space-between gl-w-full">
+  <div class="gl-flex gl-items-center gl-justify-content-space-between gl-w-full">
     <h2
-      class="gl-new-card-title gl-heading-3 gl-m-0! gl-display-flex gl-gap-3"
+      class="gl-new-card-title gl-heading-3 gl-m-0! gl-flex gl-gap-3"
       data-testid="release-block-title"
     >
       <gl-link v-if="selfLink" class="gl-text-black-normal" :href="selfLink">
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue
index 95cb6c7719c..b5178dcde1d 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue
@@ -55,7 +55,7 @@ export default {
 
 <template>
   <div class="labels-select-contents-create js-labels-create">
-    <div class="dropdown-title d-flex gl-align-items-center pt-0 pb-2 gl-mb-0">
+    <div class="dropdown-title gl-flex gl-items-center pt-0 pb-2 gl-mb-0">
       <gl-button
         :aria-label="__('Go back')"
         category="tertiary"
@@ -93,7 +93,7 @@ export default {
           @click.prevent="handleColorClick(color)"
         />
       </div>
-      <div class="color-input-container gl-display-flex">
+      <div class="color-input-container gl-flex">
         <gl-form-input
           v-model.trim="selectedColor"
           class="gl-rounded-top-right-none gl-rounded-bottom-right-none -gl-mr-1 gl-mb-2 gl-w-8"
@@ -114,7 +114,7 @@ export default {
         :disabled="disableCreate"
         category="primary"
         variant="confirm"
-        class="float-left d-flex gl-align-items-center"
+        class="float-left gl-flex gl-items-center"
         data-testid="create-click"
         @click="handleCreateClick"
       >
diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
index 674e2b4997b..40ce5288475 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
@@ -55,7 +55,7 @@ export default {
     data-placement="left"
     class="gl-inline-block js-user-link !gl-text-inherit gl-hover-text-blue-800!"
   >
-    <!-- use d-flex so that slot can be appropriately styled -->
+    <!-- use gl-flex so that slot can be appropriately styled -->
     <span class="gl-flex">
       <reviewer-avatar :user="user" :img-size="24" :issuable-type="issuableType" />
       <slot :user="user"></slot>
diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue
index 9b8b7e2e15e..2aa2a9ed99e 100644
--- a/app/assets/javascripts/snippets/components/snippet_header.vue
+++ b/app/assets/javascripts/snippets/components/snippet_header.vue
@@ -255,7 +255,7 @@ export default {
 <template>
   <div>
     <div
-      class="gl-display-flex gl-align-items-flex-start gl-flex-direction-column gl-sm-flex-direction-row gl-gap-3 gl-pt-3"
+      class="gl-flex gl-align-items-flex-start gl-flex-direction-column gl-sm-flex-direction-row gl-gap-3 gl-pt-3"
     >
       <span
         v-if="snippet.hidden"
@@ -278,7 +278,7 @@ export default {
 
       <div
         v-if="hasPersonalSnippetActions"
-        class="gl-display-flex gl-align-self-center gl-gap-3 gl-w-full gl-sm-w-auto gl-flex-direction-column gl-sm-flex-direction-row"
+        class="gl-flex gl-align-self-center gl-gap-3 gl-w-full gl-sm-w-auto gl-flex-direction-column gl-sm-flex-direction-row"
       >
         <gl-button
           v-if="snippet.userPermissions.updateSnippet"
@@ -312,7 +312,7 @@ export default {
             <div class="gl-w-full gl-min-h-7">
               <gl-button
                 class="gl-sm-display-none! gl-new-dropdown-toggle gl-w-full"
-                button-text-classes="gl-display-flex gl-justify-content-space-between gl-w-full"
+                button-text-classes="gl-flex gl-justify-content-space-between gl-w-full"
                 category="secondary"
                 tabindex="0"
               >
@@ -321,7 +321,7 @@ export default {
               </gl-button>
               <gl-button
                 v-gl-tooltip="showDropdownTooltip"
-                class="gl-display-none gl-sm-display-flex! gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret"
+                class="gl-hidden sm:gl-flex gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret"
                 category="tertiary"
                 icon="ellipsis_v"
                 :aria-label="$options.i18n.snippetAction"
@@ -349,9 +349,9 @@ export default {
     <div
       class="detail-page-header gl-flex-direction-column gl-md-flex-direction-row gl-p-0 gl-mb-5"
     >
-      <div class="gl-display-flex gl-align-items-baseline">
+      <div class="gl-flex gl-items-baseline">
         <div
-          class="has-tooltip gl-display-flex gl-align-self-baseline gl-mt-3 gl-mr-2"
+          class="has-tooltip gl-flex gl-align-self-baseline gl-mt-3 gl-mr-2"
           data-testid="snippet-container"
           :title="snippetVisibilityLevelDescription"
           data-container="body"
diff --git a/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue b/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
index 578f3eeaf51..3d4238aaf1f 100644
--- a/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
@@ -53,7 +53,7 @@ export default {
           :value="option.value"
           class="gl-mb-3"
         >
-          <div class="gl-display-flex gl-align-items-center">
+          <div class="gl-flex gl-items-center">
             <gl-icon :size="16" :name="option.icon" />
             <span
               class="gl-font-semibold gl-ml-2 js-visibility-option"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
index b13f414e70c..35f3b420005 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
@@ -24,7 +24,7 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex gl-align-items-center">
+  <div class="gl-flex gl-items-center">
     <span class="text-muted">{{ s__('mrWidget|Approval is optional') }}</span>
     <gl-link
       v-if="canApprove && helpPath"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
index cbd095c0a0c..a091956fde1 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
@@ -45,7 +45,7 @@ export default {
 </script>
 <template>
   <div class="mr-widget-extension">
-    <div class="d-flex gl-align-items-center pl-3 gl-py-3">
+    <div class="gl-flex gl-items-center pl-3 gl-py-3">
       <div v-if="hasError" class="ci-widget media">
         <div class="media-body">
           <span class="gl-font-sm gl-ml-7 gl-leading-24 js-error-state">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
index f88c06e41f8..40bc5364977 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
@@ -174,17 +174,14 @@ export default {
     </template>
     <template v-else-if="!hasPipeline">
       <gl-loading-icon size="sm" />
-      <p
-        class="gl-flex-grow-1 gl-display-flex gl-ml-3 gl-mb-0"
-        data-testid="monitoring-pipeline-message"
-      >
+      <p class="gl-flex-grow-1 gl-flex gl-ml-3 gl-mb-0" data-testid="monitoring-pipeline-message">
         {{ $options.monitoringPipelineText }}
         <gl-link
           v-gl-tooltip
           :href="ciTroubleshootingDocsPath"
           target="_blank"
           :title="__('Get more information about troubleshooting pipelines')"
-          class="gl-display-flex gl-align-items-center gl-ml-2"
+          class="gl-flex gl-items-center gl-ml-2"
         >
           <gl-icon
             name="question-o"
@@ -195,12 +192,12 @@ export default {
     </template>
     <template v-else-if="hasPipeline">
       <ci-icon :status="status" class="gl-align-self-start gl-mt-2 gl-mr-3" />
-      <div class="ci-widget-container d-flex">
+      <div class="ci-widget-container gl-flex">
         <div class="ci-widget-content">
           <div class="media-body">
             <div
               data-testid="pipeline-info-container"
-              class="gl-display-flex gl-flex-wrap gl-align-items-center gl-justify-content-space-between"
+              class="gl-flex gl-flex-wrap gl-align-items-center gl-justify-content-space-between"
             >
               <p
                 class="mr-pipeline-title gl-align-self-start gl-m-0! gl-mr-3! gl-font-bold gl-text-gray-900"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
index 214d4711c25..8f5b5e0a06e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
@@ -29,9 +29,7 @@ export default {
 <template>
   <li>
     <div class="commit-message-editor">
-      <div
-        class="gl-display-flex gl-flex-wrap gl-align-items-center justify-content-between gl-mb-3"
-      >
+      <div class="gl-flex gl-flex-wrap gl-align-items-center justify-content-between gl-mb-3">
         <label class="col-form-label" :for="inputId">
           <strong>{{ label }}</strong>
         </label>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
index d7667e3de85..60f7086d46c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
@@ -56,7 +56,7 @@ export default {
 <template>
   <div>
     <div
-      class="js-mr-widget-commits-count mr-widget-extension clickable d-flex gl-align-items-center px-3 py-2"
+      class="js-mr-widget-commits-count mr-widget-extension clickable gl-flex gl-items-center px-3 py-2"
       @click="toggle()"
     >
       <gl-button
diff --git a/app/assets/javascripts/vue_shared/components/deployment_instance.vue b/app/assets/javascripts/vue_shared/components/deployment_instance.vue
index c37eeda51c5..a1016b6b869 100644
--- a/app/assets/javascripts/vue_shared/components/deployment_instance.vue
+++ b/app/assets/javascripts/vue_shared/components/deployment_instance.vue
@@ -73,6 +73,6 @@ export default {
     v-gl-tooltip
     :class="cssClass"
     :title="tooltipText"
-    class="deployment-instance d-flex justify-content-center gl-align-items-center"
+    class="deployment-instance gl-flex justify-content-center gl-items-center"
   />
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue
index 97cac919b2a..11c59eb3496 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue
@@ -29,7 +29,7 @@ export default {
 </script>
 
 <template>
-  <div class="two-up view d-flex">
+  <div class="two-up view gl-flex">
     <image-viewer
       :path="oldPath"
       :file-size="oldSize"
diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
index b011e010b06..dc900faa71b 100644
--- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
+++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue
@@ -103,7 +103,7 @@ export default {
       data-testid="project-search-field"
       @input="onInput"
     />
-    <div class="d-flex flex-column">
+    <div class="gl-flex flex-column">
       <gl-loading-icon v-if="showLoadingIndicator" size="sm" class="py-2 px-4" />
       <gl-infinite-scroll
         :max-list-height="maxListHeight"
@@ -112,7 +112,7 @@ export default {
         @bottomReached="bottomReached"
       >
         <template v-if="!showLoadingIndicator" #items>
-          <div class="gl-display-flex gl-flex-direction-column gl-p-3">
+          <div class="gl-flex gl-flex-col gl-p-3">
             <project-list-item
               v-for="project in projectSearchResults"
               :key="project.id"
diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb
index 9e00fa69f94..2553074d0ff 100644
--- a/app/controllers/groups/settings/ci_cd_controller.rb
+++ b/app/controllers/groups/settings/ci_cd_controller.rb
@@ -6,7 +6,7 @@ module Groups
       layout 'group_settings'
       skip_cross_project_access_check :show
       before_action :authorize_admin_group!, except: :show
-      before_action :authorize_admin_cicd_variables!, only: :show
+      before_action :authorize_show_cicd_settings!, only: :show
       before_action :authorize_update_max_artifacts_size!, only: [:update]
       before_action :define_variables, only: [:show]
       before_action :push_licensed_features, only: [:show]
@@ -47,6 +47,15 @@ module Groups
 
       private
 
+      def authorize_show_cicd_settings!
+        return if can_any?(current_user, [
+          :admin_cicd_variables,
+          :admin_runner
+        ], group)
+
+        access_denied!
+      end
+
       def define_variables
         define_ci_variables
       end
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index c428f78960b..bbdd27a7184 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Projects::RunnersController < Projects::ApplicationController
-  before_action :authorize_admin_build!
+  before_action :authorize_admin_runner!
   before_action :authorize_create_runner!, only: [:new, :register]
   before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show, :register]
 
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 193ef7bb9af..8efae6f8a1d 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -9,7 +9,7 @@ module Projects
 
       layout 'project_settings'
       before_action :authorize_admin_pipeline!, except: :show
-      before_action :authorize_admin_cicd_variables!, only: :show
+      before_action :authorize_show_cicd_settings!, only: :show
       before_action :check_builds_available!
       before_action :define_variables
 
@@ -75,6 +75,15 @@ module Projects
 
       private
 
+      def authorize_show_cicd_settings!
+        return if can_any?(current_user, [
+          :admin_cicd_variables,
+          :admin_runner
+        ], project)
+
+        access_denied!
+      end
+
       def highlight_badge(name, content, language = nil)
         Gitlab::Highlight.highlight(name, content, language: language)
       end
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index a5f0a6a1315..a9ad133c023 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -265,6 +265,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
     enable :admin_namespace
     enable :admin_group_member
     enable :admin_package
+    enable :admin_runner
     enable :admin_integrations
     enable :change_visibility_level
 
diff --git a/app/policies/namespaces/user_namespace_policy.rb b/app/policies/namespaces/user_namespace_policy.rb
index f2ac0f0403d..325bd88027a 100644
--- a/app/policies/namespaces/user_namespace_policy.rb
+++ b/app/policies/namespaces/user_namespace_policy.rb
@@ -13,6 +13,7 @@ module Namespaces
       enable :create_projects
       enable :import_projects
       enable :admin_namespace
+      enable :admin_runner
       enable :read_namespace
       enable :read_namespace_via_membership
       enable :read_statistics
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index bb6f917d426..22728c08b30 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -619,6 +619,7 @@ class ProjectPolicy < BasePolicy
     enable :read_import_error
     enable :admin_cicd_variables
     enable :admin_push_rules
+    enable :admin_runner
     enable :manage_deploy_tokens
     enable :manage_merge_request_settings
     enable :change_restrict_user_defined_variables
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 4a72a2a248a..1ae29ec78ed 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -357,7 +357,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
       label = icon + _('Add LICENSE')
       AnchorData.new(
         false,
-        content_tag(:span, label, class: 'add-license-link d-flex'),
+        content_tag(:span, label, class: 'add-license-link gl-flex'),
         empty_repo? ? add_license_ide_path : add_license_path
       )
     end
diff --git a/app/services/groups/update_shared_runners_service.rb b/app/services/groups/update_shared_runners_service.rb
index 60ef838a34c..dfa7631f499 100644
--- a/app/services/groups/update_shared_runners_service.rb
+++ b/app/services/groups/update_shared_runners_service.rb
@@ -3,7 +3,7 @@
 module Groups
   class UpdateSharedRunnersService < Groups::BaseService
     def execute
-      return error('Operation not allowed', 403) unless can?(current_user, :admin_group, group)
+      return error('Operation not allowed', 403) unless can?(current_user, :admin_runner, group)
 
       validate_params
 
diff --git a/app/validators/json_schemas/member_role_permissions.json b/app/validators/json_schemas/member_role_permissions.json
index e56df0c9030..843bcbc4f6c 100644
--- a/app/validators/json_schemas/member_role_permissions.json
+++ b/app/validators/json_schemas/member_role_permissions.json
@@ -22,6 +22,9 @@
     "admin_push_rules": {
       "type": "boolean"
     },
+    "admin_runners": {
+      "type": "boolean"
+    },
     "admin_terraform_state": {
       "type": "boolean"
     },
diff --git a/app/views/ci/variables/_variable_header.html.haml b/app/views/ci/variables/_variable_header.html.haml
index 7a4384f2052..a164099821f 100644
--- a/app/views/ci/variables/_variable_header.html.haml
+++ b/app/views/ci/variables/_variable_header.html.haml
@@ -1,7 +1,7 @@
 - only_key_value = local_assigns.fetch(:only_key_value, false)
 
 %li.ci-variable-row.m-0.gl-hidden.sm:gl-block
-  .d-flex.gl-w-full.gl-align-items-center.pb-2
+  .gl-flex.gl-w-full.gl-align-items-center.pb-2
     .bold.table-section.section-15.gl-mr-3
       = s_('CiVariables|Type')
     .bold.table-section.section-15.gl-mr-3
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 0e0ad965017..405241481c0 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -41,7 +41,7 @@
     .todos-filters
       .issues-details-filters.row-content-block.second-block
         = form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row' do
-          .filter-categories.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-flex-wrap.-gl-mx-2
+          .filter-categories.gl-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-flex-wrap.-gl-mx-2
             .filter-item.gl-m-2
               - if params[:group_id].present?
                 = hidden_field_tag(:group_id, params[:group_id])
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 35c67674bf1..2e73e345d60 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -2,7 +2,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     - if event.target
diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml
index 45ef21d5bf9..31ddd031a7a 100644
--- a/app/views/events/event/_created_project.html.haml
+++ b/app/views/events/event/_created_project.html.haml
@@ -2,7 +2,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     %span.event-type{ class: event.action_name + user_profile_activity_classes }
diff --git a/app/views/events/event/_design.html.haml b/app/views/events/event/_design.html.haml
index 9fc6577ae7a..6a9a8a97dbb 100644
--- a/app/views/events/event/_design.html.haml
+++ b/app/views/events/event/_design.html.haml
@@ -2,7 +2,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     %span.event-type{ class: event.action_name + user_profile_activity_classes }
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 7329561d8ae..563b6c2e66e 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -4,7 +4,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     %span.event-type{ class: event.action_name + user_profile_activity_classes }
diff --git a/app/views/events/event/_private.html.haml b/app/views/events/event/_private.html.haml
index 74cfb407d89..66e2974dcb0 100644
--- a/app/views/events/event/_private.html.haml
+++ b/app/views/events/event/_private.html.haml
@@ -6,6 +6,6 @@
 
   = event_user_info(event)
 
-  .event-title.d-flex.gl-flex-wrap
+  .event-title.gl-flex.gl-flex-wrap
     = inline_event_icon(event)
     = s_('Profiles|Made a private contribution')
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 919cc3c380a..4304b71d847 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -4,7 +4,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     %span.event-type.pushed{ class: user_profile_activity_classes }= event.push_activity_description
diff --git a/app/views/events/event/_wiki.html.haml b/app/views/events/event/_wiki.html.haml
index 8bc01d19fd9..f88274ed445 100644
--- a/app/views/events/event/_wiki.html.haml
+++ b/app/views/events/event/_wiki.html.haml
@@ -2,7 +2,7 @@
 
 = event_user_info(event)
 
-.event-title.gl-display-flex.gl-flex-wrap
+.event-title.gl-flex.gl-flex-wrap
   = inline_event_icon(event)
   .event-title-block.gl-display-inline-block.gl-mr-2
     %span.event-type{ class: event.action_name + user_profile_activity_classes }
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml
index c0374740034..3f6a9a976f1 100644
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
@@ -26,7 +26,7 @@
     .settings-content
       = render 'ci/variables/index', save_endpoint: group_variables_path
 
-- if can?(current_user, :admin_group, @group)
+- if can?(current_user, :admin_runner, @group)
   %section.settings#runners-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header
       %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
@@ -39,6 +39,7 @@
     .settings-content
       = render 'groups/runners/settings'
 
+- if can?(current_user, :admin_group, @group)
   %section.settings#auto-devops-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header
       %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml
index dc80aeb8a30..5b9676c62c3 100644
--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -1,8 +1,8 @@
 - page_title _('Bitbucket import')
 - header_title _('Projects'), root_path
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Bitbucket')
 
diff --git a/app/views/import/bitbucket_server/new.html.haml b/app/views/import/bitbucket_server/new.html.haml
index 583d312154c..dc19c74c8f8 100644
--- a/app/views/import/bitbucket_server/new.html.haml
+++ b/app/views/import/bitbucket_server/new.html.haml
@@ -2,8 +2,8 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import repositories from Bitbucket Server')
 %hr
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index 5375ca4a40b..665168c571f 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -1,7 +1,7 @@
 - page_title _('Bitbucket Server import')
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Bitbucket Server')
 
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index 001f6588405..cf17bdd3ee4 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -2,8 +2,8 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bug', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from FogBugz')
 %hr
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index 6aac7aa65af..85f411f4515 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -2,8 +2,8 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bug', css_class: 'gl-mr-2')
   = _('Import projects from FogBugz')
 %hr
diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml
index 7512e3d3935..9371e485399 100644
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@@ -1,6 +1,6 @@
 - page_title _("FogBugz import")
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('bug', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from FogBugz')
 
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index dcee0c473a1..9bc7855fe54 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -2,8 +2,8 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('gitea', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Gitea')
 %hr
diff --git a/app/views/import/gitea/status.html.haml b/app/views/import/gitea/status.html.haml
index 86ab3ca85c3..8aa429c744c 100644
--- a/app/views/import/gitea/status.html.haml
+++ b/app/views/import/gitea/status.html.haml
@@ -1,6 +1,6 @@
 - page_title _("Gitea import")
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('gitea', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Gitea')
 
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml
index b90d400a843..5561f743391 100644
--- a/app/views/import/gitlab_projects/new.html.haml
+++ b/app/views/import/gitlab_projects/new.html.haml
@@ -2,8 +2,8 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
-  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+%h1.page-title.gl-font-size-h-display.gl-flex.gl-items-center
+  .gl-flex.gl-items-center.gl-justify-content-center
     = sprite_icon('tanuki', css_class: 'gl-mr-3', size: 48)
   = _('Import an exported GitLab project')
 %hr
diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml
index 91de433284a..86bfbc41d18 100644
--- a/app/views/layouts/fullscreen.html.haml
+++ b/app/views/layouts/fullscreen.html.haml
@@ -11,6 +11,6 @@
           = render "layouts/broadcast"
           = yield :flash_message
           = render "layouts/flash", flash_container_no_margin: true
-        .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch gl-p-0" }
+        .content-wrapper{ id: "content-body", class: "!gl-flex flex-column align-items-stretch gl-p-0" }
           = yield
     = footer_message
diff --git a/app/views/projects/_stat_anchor_list.html.haml b/app/views/projects/_stat_anchor_list.html.haml
index 862bc1fdfb1..1a8b945f3eb 100644
--- a/app/views/projects/_stat_anchor_list.html.haml
+++ b/app/views/projects/_stat_anchor_list.html.haml
@@ -1,6 +1,6 @@
 - anchors = local_assigns.fetch(:anchors, [])
 - project_buttons = local_assigns.fetch(:project_buttons, false)
-- stat_text_classes = "stat-text d-flex gl-align-items-center gl-px-0! gl-pb-2!"
+- stat_text_classes = "stat-text gl-flex gl-items-center gl-px-0! gl-pb-2!"
 
 - return unless anchors.any?
 
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 7be50ff3b2b..df5b8701b80 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -38,29 +38,29 @@
               = sprite_icon('branch', size: 12, css_class: 'fork-sprite')
               = merge_request.target_branch
         - if merge_request.labels.any?
-          .gl-mt-2.gl-display-flex.gl-flex-wrap.gl-gap-2{ role: 'group', 'aria-label': _('Labels') }
+          .gl-mt-2.gl-flex.gl-flex-wrap.gl-gap-2{ role: 'group', 'aria-label': _('Labels') }
             - presented_labels_sorted_by_title(merge_request.labels, merge_request.project).each do |label|
               = link_to_label(label, type: :merge_request)
 
-    .gl-font-sm.gl-display-flex.gl-flex-shrink-0.gl-align-self-start.gl-gap-1.gl-flex-direction-row.gl-justify-content-space-between.gl-w-full.gl-md-w-auto{ class: 'gl-md-flex-direction-column!' }
+    .gl-font-sm.gl-flex.gl-flex-shrink-0.gl-align-self-start.gl-gap-1.gl-flex-direction-row.gl-justify-content-space-between.gl-w-full.gl-md-w-auto{ class: 'gl-md-flex-direction-column!' }
       %ul.controls.gl-gap-3.gl-pl-0.gl-align-self-end
         - if merge_request.merged?
           - merged_at = merge_request.merged_at ? l(merge_request.merged_at.to_time) : _("Merge date & time could not be determined")
-          %li.gl-display-flex{ class: 'gl-mr-0!' }
+          %li.gl-flex{ class: 'gl-mr-0!' }
             %a.has-tooltip{ href: "#{merge_request_path(merge_request)}#widget-state", title: merged_at }
               = render Pajamas::BadgeComponent.new(_('Merged'), size: 'sm', variant: 'info')
         - elsif merge_request.closed?
-          %li.gl-display-flex{ class: 'gl-mr-0!' }
+          %li.gl-flex{ class: 'gl-mr-0!' }
             = render Pajamas::BadgeComponent.new(_('Closed'), size: 'sm', variant: 'danger')
         - if merge_request.open? && merge_request.broken?
-          %li.issuable-pipeline-broken.gl-display-flex{ class: 'gl-mr-0!' }
+          %li.issuable-pipeline-broken.gl-flex{ class: 'gl-mr-0!' }
             = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do
               = sprite_icon('warning-solid')
         - if merge_request.assignees.any?
-          %li.gl-display-flex{ class: 'gl-mr-0!' }
+          %li.gl-flex{ class: 'gl-mr-0!' }
             = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request
         - if merge_request.reviewers.any?
-          %li.gl-display-flex.issuable-reviewers{ class: 'gl-mr-0!' }
+          %li.gl-flex.issuable-reviewers{ class: 'gl-mr-0!' }
             = render 'shared/issuable/reviewers', project: merge_request.project, issuable: merge_request
         = render 'shared/issuable_meta_data', issuable: merge_request
         = render 'projects/merge_requests/approvals_count', merge_request: merge_request
diff --git a/app/views/projects/merge_requests/_page.html.haml b/app/views/projects/merge_requests/_page.html.haml
index 1b4e52fc639..5090691c436 100644
--- a/app/views/projects/merge_requests/_page.html.haml
+++ b/app/views/projects/merge_requests/_page.html.haml
@@ -24,8 +24,8 @@
   .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
     = render "projects/merge_requests/mr_box"
     .gl-static.merge-request-tabs-holder{ class: "#{'js-tabs-affix' unless ENV['RAILS_ENV'] == 'test'}" }
-      .merge-request-tabs-container.gl-display-flex.gl-justify-content-space-between{ class: "#{'is-merge-request' if !fluid_layout}" }
-        %ul.merge-request-tabs.nav-tabs.nav.nav-links.gl-display-flex.gl-flex-nowrap.gl-m-0.gl-p-0.gl-w-full.gl-lg-w-auto
+      .merge-request-tabs-container.gl-flex.gl-justify-content-space-between{ class: "#{'is-merge-request' if !fluid_layout}" }
+        %ul.merge-request-tabs.nav-tabs.nav.nav-links.gl-flex.gl-flex-nowrap.gl-m-0.gl-p-0.gl-w-full.gl-lg-w-auto
           = render "projects/merge_requests/tabs/tab", class: "notes-tab", testid: "notes-tab" do
             = tab_link_for @merge_request, :show, force_link: @commit.present? do
               = _("Overview")
@@ -47,7 +47,7 @@
         .gl-flex.gl-flex-wrap.gl-items-center.justify-content-lg-end
           #js-vue-discussion-counter{ data: { blocks_merge: @project.only_allow_merge_if_all_discussions_are_resolved?.to_s } }
           - if !!@issuable_sidebar.dig(:current_user, :id)
-            .gl-display-flex.gl-gap-3
+            .gl-flex.gl-gap-3
               .js-sidebar-todo-widget-root{ data: { project_path: @issuable_sidebar[:project_full_path], iid: @issuable_sidebar[:iid], id: @issuable_sidebar[:id] } }
               - if notifications_todos_buttons_enabled?
                 .js-sidebar-subscriptions-widget-root{ data: { full_path: @issuable_sidebar[:project_full_path], iid: @issuable_sidebar[:iid] } }
diff --git a/app/views/projects/project_templates/_template.html.haml b/app/views/projects/project_templates/_template.html.haml
index 52ee5045bc3..4d2f9ce50fd 100644
--- a/app/views/projects/project_templates/_template.html.haml
+++ b/app/views/projects/project_templates/_template.html.haml
@@ -1,4 +1,4 @@
-.template-option.d-flex.gl-align-items-center{ data: { testid: 'template-option-container' } }
+.template-option.gl-items-center{ class: '!gl-flex', data: { testid: 'template-option-container' } }
   .logo.gl-mr-3.px-1
     = image_tag template.logo, size: 32, class: "btn-template-icon icon-#{template.name}"
   .description
@@ -7,7 +7,7 @@
     %br
     .text-muted
       = template.description
-  .controls.d-flex.gl-align-items-center
+  .controls.gl-items-center{ class: '!gl-flex' }
     = render Pajamas::ButtonComponent.new(button_options: { class: 'gl-mr-3', data: { track_label: "template_preview", track_property: template.name, track_action: "click_button", track_value: "" } }, href: template.preview, target: '_blank') do
       = _("Preview")
     %label.btn.gl-button.btn-confirm.template-button.choose-template.gl-mb-0{ for: template.name,
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 322d958763d..6df016c4ed2 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -34,6 +34,7 @@
 
   = render_if_exists 'projects/settings/ci_cd/protected_environments', expanded: expanded
 
+- if can?(current_user, :admin_runner, @project)
   - expand_runners = expanded || params[:expand_runners]
   %section.settings.no-animate#js-runners-settings{ class: ('expanded' if expand_runners), data: { testid: 'runners-settings-content' } }
     .settings-header
@@ -47,6 +48,7 @@
     .settings-content
       = render 'projects/runners/settings'
 
+- if can?(current_user, :admin_pipeline, @project)
   - if Gitlab::CurrentSettings.current_application_settings.keep_latest_artifact?
     %section.settings.no-animate#js-artifacts-settings{ class: ('expanded' if expanded) }
       .settings-header
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index be049a2b702..2ae6b03b00d 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -7,8 +7,8 @@
 - block_css_class = type != :productivity_analytics ? 'row-content-block second-block' : ''
 
 .issues-filters
-  .issues-details-filters.filtered-search-block.gl-display-flex.gl-flex-direction-column.gl-lg-flex-direction-row.gl-gap-3{ class: block_css_class }
-    .gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-w-full
+  .issues-details-filters.filtered-search-block.gl-flex.gl-flex-direction-column.gl-lg-flex-direction-row.gl-gap-3{ class: block_css_class }
+    .gl-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-w-full
       = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form gl-w-full' do
         - if params[:search].present?
           = hidden_field_tag :search, params[:search]
@@ -18,7 +18,7 @@
               - c.with_label do
                 %span.gl-sr-only
                   = _('Select all')
-        .issues-other-filters.filtered-search-wrapper.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row
+        .issues-other-filters.filtered-search-wrapper.gl-flex.gl-flex-direction-column.gl-md-flex-direction-row
           .filtered-search-box
             - if type != :boards
               - text = tag.span(sprite_icon('history')) + tag.span(_('Recent searches'), class: "gl-sr-only")
@@ -206,6 +206,6 @@
               = render_if_exists 'shared/issuable/filter_epic', type: type
 
             = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, icon: 'clear', icon_classes: "clear-search-icon", button_options: { class: 'clear-search hidden gl-align-self-center gl-mr-1 has-tooltip', title: _('Clear') })
-    .filter-dropdown-container.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-align-items-flex-start
+    .filter-dropdown-container.gl-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-align-items-flex-start
       - if type != :productivity_analytics && show_sorting_dropdown
         = render 'shared/issuable/sort_dropdown'
diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml
index 34815026ff2..70668931715 100644
--- a/app/views/shared/issuable/form/_branch_chooser.html.haml
+++ b/app/views/shared/issuable/form/_branch_chooser.html.haml
@@ -19,7 +19,7 @@
 
 - visibilityMismatchString = i18n["#{source_level}#{target_level}"]
 
-.form-group.row.d-flex.gl-px-5.branch-selector
+.form-group.row.gl-flex.gl-px-5.branch-selector
   .align-self-center
     %span
       = html_escape(_('From %{code_open}%{source_title}%{code_close} into')) % { source_title: source_title, code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index c1e9ee85a54..02e6c75e88e 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -9,7 +9,7 @@
 
 -# Note this is just for individual members. For groups please see shared/members/_group
 
-%li.member.js-member.py-2.px-3.d-flex.flex-column{ class: [dom_class(member), ("flex-md-row" unless force_mobile_view)], id: dom_id(member) }
+%li.member.js-member.py-2.px-3.gl-flex.flex-column{ class: [dom_class(member), ("flex-md-row" unless force_mobile_view)], id: dom_id(member) }
   %span.list-item-name.mb-2.m-md-0
     - if user
       = render Pajamas::AvatarComponent.new(user, size: 32, class: 'gl-mr-3 flex-shrink-0 flex-grow-0')
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index c059b49b6c7..15645519097 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -50,7 +50,7 @@
     - if can_admin_milestone
       - show_delete = @project.present? || @group.present?
       .col-1.order-2.order-md-3
-        .gl-display-flex.gl-justify-content-end
+        .gl-flex.gl-justify-content-end
           .js-vue-milestone-actions{ data: { id: milestone.id,
             title: milestone.title,
             is_active: milestone.active?.to_s,
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index db7e0c5f9a4..00a14a10477 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1,6 +1,6 @@
 - page_title _("New Snippet")
 
-.page-title-holder.d-flex.gl-align-items-center
+.page-title-holder.gl-flex.gl-items-center
   %h1.page-title.gl-font-size-h-display= _('New Snippet')
 
 .gl-mt-3
diff --git a/config/feature_flags/gitlab_com_derisk/diff_preview_in_email.yml b/config/feature_flags/beta/diff_preview_in_email.yml
similarity index 82%
rename from config/feature_flags/gitlab_com_derisk/diff_preview_in_email.yml
rename to config/feature_flags/beta/diff_preview_in_email.yml
index d00718ea96e..b38801af6da 100644
--- a/config/feature_flags/gitlab_com_derisk/diff_preview_in_email.yml
+++ b/config/feature_flags/beta/diff_preview_in_email.yml
@@ -3,6 +3,6 @@ name: diff_preview_in_email
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60007
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382055
 milestone: '15.6'
-type: gitlab_com_derisk
+type: beta
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/db/docs/batched_background_migrations/backfill_draft_notes_project_id.yml b/db/docs/batched_background_migrations/backfill_draft_notes_project_id.yml
new file mode 100644
index 00000000000..126b89e09fd
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_draft_notes_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillDraftNotesProjectId
+description: Backfills sharding key `draft_notes.project_id` from `merge_requests`.
+feature_category: code_review_workflow
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155403
+milestone: '17.1'
+queued_migration_version: 20240605090456
+finalize_after: '2024-07-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_merge_request_assignees_project_id.yml b/db/docs/batched_background_migrations/backfill_merge_request_assignees_project_id.yml
new file mode 100644
index 00000000000..923fbf43a18
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_merge_request_assignees_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillMergeRequestAssigneesProjectId
+description: Backfills sharding key `merge_request_assignees.project_id` from `merge_requests`.
+feature_category: code_review_workflow
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155492
+milestone: '17.1'
+queued_migration_version: 20240605193142
+finalize_after: '2024-07-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/batched_background_migrations/backfill_vulnerability_state_transitions_project_id.yml b/db/docs/batched_background_migrations/backfill_vulnerability_state_transitions_project_id.yml
new file mode 100644
index 00000000000..01b30086077
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_vulnerability_state_transitions_project_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillVulnerabilityStateTransitionsProjectId
+description: Backfills sharding key `vulnerability_state_transitions.project_id` from `vulnerabilities`.
+feature_category: vulnerability_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155496
+milestone: '17.1'
+queued_migration_version: 20240605193707
+finalize_after: '2024-07-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/draft_notes.yml b/db/docs/draft_notes.yml
index e9d37ad9946..e11e8889672 100644
--- a/db/docs/draft_notes.yml
+++ b/db/docs/draft_notes.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: merge_requests
         sharding_key: target_project_id
         belongs_to: merge_request
+desired_sharding_key_migration_job_name: BackfillDraftNotesProjectId
diff --git a/db/docs/merge_request_assignees.yml b/db/docs/merge_request_assignees.yml
index 5ad76effc7d..216e4a8c10f 100644
--- a/db/docs/merge_request_assignees.yml
+++ b/db/docs/merge_request_assignees.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: merge_requests
         sharding_key: target_project_id
         belongs_to: merge_request
+desired_sharding_key_migration_job_name: BackfillMergeRequestAssigneesProjectId
diff --git a/db/docs/metrics_dashboard_annotations.yml b/db/docs/metrics_dashboard_annotations.yml
index 6ecf5317794..74e84a045a4 100644
--- a/db/docs/metrics_dashboard_annotations.yml
+++ b/db/docs/metrics_dashboard_annotations.yml
@@ -8,3 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27583
 milestone: '13.0'
 gitlab_schema: gitlab_main
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/464344
diff --git a/db/docs/prometheus_metrics.yml b/db/docs/prometheus_metrics.yml
index 69c74dd1629..024a2ab5150 100644
--- a/db/docs/prometheus_metrics.yml
+++ b/db/docs/prometheus_metrics.yml
@@ -8,3 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3799
 milestone: '9.3'
 gitlab_schema: gitlab_main
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/465327
diff --git a/db/docs/vulnerability_state_transitions.yml b/db/docs/vulnerability_state_transitions.yml
index f7c7debfdb4..68b04e90d03 100644
--- a/db/docs/vulnerability_state_transitions.yml
+++ b/db/docs/vulnerability_state_transitions.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: vulnerabilities
         sharding_key: project_id
         belongs_to: vulnerability
+desired_sharding_key_migration_job_name: BackfillVulnerabilityStateTransitionsProjectId
diff --git a/db/migrate/20240605090452_add_project_id_to_draft_notes.rb b/db/migrate/20240605090452_add_project_id_to_draft_notes.rb
new file mode 100644
index 00000000000..8b4eda7836c
--- /dev/null
+++ b/db/migrate/20240605090452_add_project_id_to_draft_notes.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToDraftNotes < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def change
+    add_column :draft_notes, :project_id, :bigint
+  end
+end
diff --git a/db/migrate/20240605193138_add_project_id_to_merge_request_assignees.rb b/db/migrate/20240605193138_add_project_id_to_merge_request_assignees.rb
new file mode 100644
index 00000000000..2b03dc4cef0
--- /dev/null
+++ b/db/migrate/20240605193138_add_project_id_to_merge_request_assignees.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToMergeRequestAssignees < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def change
+    add_column :merge_request_assignees, :project_id, :bigint
+  end
+end
diff --git a/db/migrate/20240605193703_add_project_id_to_vulnerability_state_transitions.rb b/db/migrate/20240605193703_add_project_id_to_vulnerability_state_transitions.rb
new file mode 100644
index 00000000000..6228856fff1
--- /dev/null
+++ b/db/migrate/20240605193703_add_project_id_to_vulnerability_state_transitions.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToVulnerabilityStateTransitions < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def change
+    add_column :vulnerability_state_transitions, :project_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20240605090453_index_draft_notes_on_project_id.rb b/db/post_migrate/20240605090453_index_draft_notes_on_project_id.rb
new file mode 100644
index 00000000000..42a146c73be
--- /dev/null
+++ b/db/post_migrate/20240605090453_index_draft_notes_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexDraftNotesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_draft_notes_on_project_id'
+
+  def up
+    add_concurrent_index :draft_notes, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :draft_notes, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240605090454_add_draft_notes_project_id_fk.rb b/db/post_migrate/20240605090454_add_draft_notes_project_id_fk.rb
new file mode 100644
index 00000000000..d4572a3dca0
--- /dev/null
+++ b/db/post_migrate/20240605090454_add_draft_notes_project_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDraftNotesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :draft_notes, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :draft_notes, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240605090455_add_draft_notes_project_id_trigger.rb b/db/post_migrate/20240605090455_add_draft_notes_project_id_trigger.rb
new file mode 100644
index 00000000000..7c0010146ac
--- /dev/null
+++ b/db/post_migrate/20240605090455_add_draft_notes_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddDraftNotesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :draft_notes,
+      sharding_key: :project_id,
+      parent_table: :merge_requests,
+      parent_sharding_key: :target_project_id,
+      foreign_key: :merge_request_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :draft_notes,
+      sharding_key: :project_id,
+      parent_table: :merge_requests,
+      parent_sharding_key: :target_project_id,
+      foreign_key: :merge_request_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240605090456_queue_backfill_draft_notes_project_id.rb b/db/post_migrate/20240605090456_queue_backfill_draft_notes_project_id.rb
new file mode 100644
index 00000000000..315711df9d6
--- /dev/null
+++ b/db/post_migrate/20240605090456_queue_backfill_draft_notes_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillDraftNotesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillDraftNotesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :draft_notes,
+      :id,
+      :project_id,
+      :merge_requests,
+      :target_project_id,
+      :merge_request_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :draft_notes,
+      :id,
+      [
+        :project_id,
+        :merge_requests,
+        :target_project_id,
+        :merge_request_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20240605193139_index_merge_request_assignees_on_project_id.rb b/db/post_migrate/20240605193139_index_merge_request_assignees_on_project_id.rb
new file mode 100644
index 00000000000..e2d49bae6b4
--- /dev/null
+++ b/db/post_migrate/20240605193139_index_merge_request_assignees_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexMergeRequestAssigneesOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_merge_request_assignees_on_project_id'
+
+  def up
+    add_concurrent_index :merge_request_assignees, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :merge_request_assignees, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240605193140_add_merge_request_assignees_project_id_fk.rb b/db/post_migrate/20240605193140_add_merge_request_assignees_project_id_fk.rb
new file mode 100644
index 00000000000..61330dd4667
--- /dev/null
+++ b/db/post_migrate/20240605193140_add_merge_request_assignees_project_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddMergeRequestAssigneesProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :merge_request_assignees, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :merge_request_assignees, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240605193141_add_merge_request_assignees_project_id_trigger.rb b/db/post_migrate/20240605193141_add_merge_request_assignees_project_id_trigger.rb
new file mode 100644
index 00000000000..e4de30ac3c2
--- /dev/null
+++ b/db/post_migrate/20240605193141_add_merge_request_assignees_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddMergeRequestAssigneesProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :merge_request_assignees,
+      sharding_key: :project_id,
+      parent_table: :merge_requests,
+      parent_sharding_key: :target_project_id,
+      foreign_key: :merge_request_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :merge_request_assignees,
+      sharding_key: :project_id,
+      parent_table: :merge_requests,
+      parent_sharding_key: :target_project_id,
+      foreign_key: :merge_request_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240605193142_queue_backfill_merge_request_assignees_project_id.rb b/db/post_migrate/20240605193142_queue_backfill_merge_request_assignees_project_id.rb
new file mode 100644
index 00000000000..0da081a8dd2
--- /dev/null
+++ b/db/post_migrate/20240605193142_queue_backfill_merge_request_assignees_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillMergeRequestAssigneesProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillMergeRequestAssigneesProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :merge_request_assignees,
+      :id,
+      :project_id,
+      :merge_requests,
+      :target_project_id,
+      :merge_request_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :merge_request_assignees,
+      :id,
+      [
+        :project_id,
+        :merge_requests,
+        :target_project_id,
+        :merge_request_id
+      ]
+    )
+  end
+end
diff --git a/db/post_migrate/20240605193704_index_vulnerability_state_transitions_on_project_id.rb b/db/post_migrate/20240605193704_index_vulnerability_state_transitions_on_project_id.rb
new file mode 100644
index 00000000000..756962bbf7d
--- /dev/null
+++ b/db/post_migrate/20240605193704_index_vulnerability_state_transitions_on_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexVulnerabilityStateTransitionsOnProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_vulnerability_state_transitions_on_project_id'
+
+  def up
+    add_concurrent_index :vulnerability_state_transitions, :project_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :vulnerability_state_transitions, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240605193705_add_vulnerability_state_transitions_project_id_fk.rb b/db/post_migrate/20240605193705_add_vulnerability_state_transitions_project_id_fk.rb
new file mode 100644
index 00000000000..b2b9601e72e
--- /dev/null
+++ b/db/post_migrate/20240605193705_add_vulnerability_state_transitions_project_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddVulnerabilityStateTransitionsProjectIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :vulnerability_state_transitions, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :vulnerability_state_transitions, column: :project_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240605193706_add_vulnerability_state_transitions_project_id_trigger.rb b/db/post_migrate/20240605193706_add_vulnerability_state_transitions_project_id_trigger.rb
new file mode 100644
index 00000000000..358e795dde6
--- /dev/null
+++ b/db/post_migrate/20240605193706_add_vulnerability_state_transitions_project_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddVulnerabilityStateTransitionsProjectIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :vulnerability_state_transitions,
+      sharding_key: :project_id,
+      parent_table: :vulnerabilities,
+      parent_sharding_key: :project_id,
+      foreign_key: :vulnerability_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :vulnerability_state_transitions,
+      sharding_key: :project_id,
+      parent_table: :vulnerabilities,
+      parent_sharding_key: :project_id,
+      foreign_key: :vulnerability_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240605193707_queue_backfill_vulnerability_state_transitions_project_id.rb b/db/post_migrate/20240605193707_queue_backfill_vulnerability_state_transitions_project_id.rb
new file mode 100644
index 00000000000..4c6f39af8b3
--- /dev/null
+++ b/db/post_migrate/20240605193707_queue_backfill_vulnerability_state_transitions_project_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillVulnerabilityStateTransitionsProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillVulnerabilityStateTransitionsProjectId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :vulnerability_state_transitions,
+      :id,
+      :project_id,
+      :vulnerabilities,
+      :project_id,
+      :vulnerability_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :vulnerability_state_transitions,
+      :id,
+      [
+        :project_id,
+        :vulnerabilities,
+        :project_id,
+        :vulnerability_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20240605090452 b/db/schema_migrations/20240605090452
new file mode 100644
index 00000000000..4d94d450671
--- /dev/null
+++ b/db/schema_migrations/20240605090452
@@ -0,0 +1 @@
+7bae218e239975d371839751de852d0c02f92bd4172e11e218de514d772abc9c
\ No newline at end of file
diff --git a/db/schema_migrations/20240605090453 b/db/schema_migrations/20240605090453
new file mode 100644
index 00000000000..f45f90d3566
--- /dev/null
+++ b/db/schema_migrations/20240605090453
@@ -0,0 +1 @@
+db285a134d4d3dfc9332f5bfb6006e48a05b9ae797cf2d3ba9965f5e90221402
\ No newline at end of file
diff --git a/db/schema_migrations/20240605090454 b/db/schema_migrations/20240605090454
new file mode 100644
index 00000000000..868e735534b
--- /dev/null
+++ b/db/schema_migrations/20240605090454
@@ -0,0 +1 @@
+a0c4ab802f3b2306baf389c5d5d2c675f1fc64457dab5f7c856c552a87a2930c
\ No newline at end of file
diff --git a/db/schema_migrations/20240605090455 b/db/schema_migrations/20240605090455
new file mode 100644
index 00000000000..499c0704a59
--- /dev/null
+++ b/db/schema_migrations/20240605090455
@@ -0,0 +1 @@
+6293f6ca7f1b9a6ea3e702652b18e1a0afd99e2df0e0d85336b1f31f388b1bc2
\ No newline at end of file
diff --git a/db/schema_migrations/20240605090456 b/db/schema_migrations/20240605090456
new file mode 100644
index 00000000000..4c598eb5457
--- /dev/null
+++ b/db/schema_migrations/20240605090456
@@ -0,0 +1 @@
+f85b2d172586ef2150fdfbbc66ac863ff1ccb02a4c28c1729b757bb25a96c545
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193138 b/db/schema_migrations/20240605193138
new file mode 100644
index 00000000000..cc67524fbed
--- /dev/null
+++ b/db/schema_migrations/20240605193138
@@ -0,0 +1 @@
+59fbd4169c5871c3ca3fb0254fe83a2e8c430f5bbd3d545f49f5f6e146f8b77f
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193139 b/db/schema_migrations/20240605193139
new file mode 100644
index 00000000000..ef84aeb87ee
--- /dev/null
+++ b/db/schema_migrations/20240605193139
@@ -0,0 +1 @@
+cdaaa0cdad308022fe9e6237c8540ae468056a8380f3a767253c5d4ccec79316
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193140 b/db/schema_migrations/20240605193140
new file mode 100644
index 00000000000..88d22f24a59
--- /dev/null
+++ b/db/schema_migrations/20240605193140
@@ -0,0 +1 @@
+43a02edd4ea94acbb41a93ae95e81bc115eb9baf268f6ef627336e13dc437c1c
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193141 b/db/schema_migrations/20240605193141
new file mode 100644
index 00000000000..ae56a648c03
--- /dev/null
+++ b/db/schema_migrations/20240605193141
@@ -0,0 +1 @@
+5448bbd12784770ed2d00562e699c0cae2a2974b9d398e5f8602ba0e2d013b97
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193142 b/db/schema_migrations/20240605193142
new file mode 100644
index 00000000000..dbb8cfac84e
--- /dev/null
+++ b/db/schema_migrations/20240605193142
@@ -0,0 +1 @@
+9e74c7570de42513c0951d7bbfb68a24abb198f2342f33d473fb987cfd454326
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193703 b/db/schema_migrations/20240605193703
new file mode 100644
index 00000000000..ec8b01f5acd
--- /dev/null
+++ b/db/schema_migrations/20240605193703
@@ -0,0 +1 @@
+d25fe1f18c12e129036aad8bfebc47d292d0b005b63b8478bf29667f2a50d5a1
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193704 b/db/schema_migrations/20240605193704
new file mode 100644
index 00000000000..ecb5f37e865
--- /dev/null
+++ b/db/schema_migrations/20240605193704
@@ -0,0 +1 @@
+60154473cad038e5bb995c5ba5f6908c11dab3fc9c5a9c58e1b0317aba609754
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193705 b/db/schema_migrations/20240605193705
new file mode 100644
index 00000000000..b21f59ac635
--- /dev/null
+++ b/db/schema_migrations/20240605193705
@@ -0,0 +1 @@
+23dbfd90d7bfbeb40ec3289f0df99e7293ebb35ffea03862d8d15d09bfe73903
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193706 b/db/schema_migrations/20240605193706
new file mode 100644
index 00000000000..4506398eaf5
--- /dev/null
+++ b/db/schema_migrations/20240605193706
@@ -0,0 +1 @@
+a23d04dc09fc8b6bddf2aa5f4176cd05e64cb2601780defe29db6ca66f3a1aa5
\ No newline at end of file
diff --git a/db/schema_migrations/20240605193707 b/db/schema_migrations/20240605193707
new file mode 100644
index 00000000000..85d725d760c
--- /dev/null
+++ b/db/schema_migrations/20240605193707
@@ -0,0 +1 @@
+266361f7d96195109e629f0f653e4794300ed1f60bd8aa9b0212cccce7e180b1
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 10d38bbe677..21bc2b0e60b 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -749,6 +749,22 @@ BEGIN
 END;
 $$;
 
+CREATE FUNCTION trigger_13d4aa8fe3dd() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "target_project_id"
+  INTO NEW."project_id"
+  FROM "merge_requests"
+  WHERE "merge_requests"."id" = NEW."merge_request_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_174b23fa3dfb() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -897,6 +913,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_44558add1625() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "target_project_id"
+  INTO NEW."project_id"
+  FROM "merge_requests"
+  WHERE "merge_requests"."id" = NEW."merge_request_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_56d49f4ed623() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -1153,6 +1185,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_c8bc8646bce9() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."project_id" IS NULL THEN
+  SELECT "project_id"
+  INTO NEW."project_id"
+  FROM "vulnerabilities"
+  WHERE "vulnerabilities"."id" = NEW."vulnerability_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_c9090feed334() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -9125,6 +9173,7 @@ CREATE TABLE draft_notes (
     line_code text,
     internal boolean DEFAULT false NOT NULL,
     note_type smallint,
+    project_id bigint,
     CONSTRAINT check_c497a94a0e CHECK ((char_length(line_code) <= 255))
 );
 
@@ -11551,7 +11600,8 @@ CREATE TABLE merge_request_assignees (
     id bigint NOT NULL,
     user_id integer NOT NULL,
     merge_request_id integer NOT NULL,
-    created_at timestamp with time zone
+    created_at timestamp with time zone,
+    project_id bigint
 );
 
 CREATE SEQUENCE merge_request_assignees_id_seq
@@ -18475,6 +18525,7 @@ CREATE TABLE vulnerability_state_transitions (
     comment text,
     dismissal_reason smallint,
     state_changed_at_pipeline_id bigint,
+    project_id bigint,
     CONSTRAINT check_fe2eb6a0f3 CHECK ((char_length(comment) <= 50000))
 );
 
@@ -26089,6 +26140,8 @@ CREATE INDEX index_draft_notes_on_discussion_id ON draft_notes USING btree (disc
 
 CREATE INDEX index_draft_notes_on_merge_request_id ON draft_notes USING btree (merge_request_id);
 
+CREATE INDEX index_draft_notes_on_project_id ON draft_notes USING btree (project_id);
+
 CREATE INDEX index_early_access_program_tracking_events_on_category ON early_access_program_tracking_events USING btree (category);
 
 CREATE INDEX index_early_access_program_tracking_events_on_event_label ON early_access_program_tracking_events USING btree (event_label);
@@ -26779,6 +26832,8 @@ CREATE INDEX index_members_on_user_id_created_at ON members USING btree (user_id
 
 CREATE UNIQUE INDEX index_merge_request_assignees_on_merge_request_id_and_user_id ON merge_request_assignees USING btree (merge_request_id, user_id);
 
+CREATE INDEX index_merge_request_assignees_on_project_id ON merge_request_assignees USING btree (project_id);
+
 CREATE INDEX index_merge_request_assignees_on_user_id ON merge_request_assignees USING btree (user_id);
 
 CREATE INDEX index_merge_request_assignment_events_on_user_id ON merge_request_assignment_events USING btree (user_id);
@@ -28577,6 +28632,8 @@ CREATE INDEX index_vulnerability_state_transitions_on_author_id ON vulnerability
 
 CREATE INDEX index_vulnerability_state_transitions_on_pipeline_id ON vulnerability_state_transitions USING btree (state_changed_at_pipeline_id);
 
+CREATE INDEX index_vulnerability_state_transitions_on_project_id ON vulnerability_state_transitions USING btree (project_id);
+
 CREATE INDEX index_vulnerability_statistics_on_latest_pipeline_id ON vulnerability_statistics USING btree (latest_pipeline_id);
 
 CREATE INDEX index_vulnerability_statistics_on_letter_grade ON vulnerability_statistics USING btree (letter_grade);
@@ -30535,6 +30592,8 @@ CREATE TRIGGER trigger_01b3fc052119 BEFORE INSERT OR UPDATE ON approval_merge_re
 
 CREATE TRIGGER trigger_10ee1357e825 BEFORE INSERT OR UPDATE ON p_ci_builds FOR EACH ROW EXECUTE FUNCTION trigger_10ee1357e825();
 
+CREATE TRIGGER trigger_13d4aa8fe3dd BEFORE INSERT OR UPDATE ON draft_notes FOR EACH ROW EXECUTE FUNCTION trigger_13d4aa8fe3dd();
+
 CREATE TRIGGER trigger_174b23fa3dfb BEFORE INSERT OR UPDATE ON approval_project_rules_users FOR EACH ROW EXECUTE FUNCTION trigger_174b23fa3dfb();
 
 CREATE TRIGGER trigger_207005e8e995 BEFORE INSERT OR UPDATE ON operations_strategies FOR EACH ROW EXECUTE FUNCTION trigger_207005e8e995();
@@ -30557,6 +30616,8 @@ CREATE TRIGGER trigger_388e93f88fdd BEFORE INSERT OR UPDATE ON packages_build_in
 
 CREATE TRIGGER trigger_43484cb41aca BEFORE INSERT OR UPDATE ON wiki_repository_states FOR EACH ROW EXECUTE FUNCTION trigger_43484cb41aca();
 
+CREATE TRIGGER trigger_44558add1625 BEFORE INSERT OR UPDATE ON merge_request_assignees FOR EACH ROW EXECUTE FUNCTION trigger_44558add1625();
+
 CREATE TRIGGER trigger_56d49f4ed623 BEFORE INSERT OR UPDATE ON workspace_variables FOR EACH ROW EXECUTE FUNCTION trigger_56d49f4ed623();
 
 CREATE TRIGGER trigger_57ad2742ac16 BEFORE INSERT OR UPDATE ON user_achievements FOR EACH ROW EXECUTE FUNCTION trigger_57ad2742ac16();
@@ -30589,6 +30650,8 @@ CREATE TRIGGER trigger_b4520c29ea74 BEFORE INSERT OR UPDATE ON approval_merge_re
 
 CREATE TRIGGER trigger_c17a166692a2 BEFORE INSERT OR UPDATE ON audit_events_streaming_headers FOR EACH ROW EXECUTE FUNCTION trigger_c17a166692a2();
 
+CREATE TRIGGER trigger_c8bc8646bce9 BEFORE INSERT OR UPDATE ON vulnerability_state_transitions FOR EACH ROW EXECUTE FUNCTION trigger_c8bc8646bce9();
+
 CREATE TRIGGER trigger_c9090feed334 BEFORE INSERT OR UPDATE ON boards_epic_lists FOR EACH ROW EXECUTE FUNCTION trigger_c9090feed334();
 
 CREATE TRIGGER trigger_catalog_resource_sync_event_on_project_update AFTER UPDATE ON projects FOR EACH ROW WHEN ((((old.name)::text IS DISTINCT FROM (new.name)::text) OR (old.description IS DISTINCT FROM new.description) OR (old.visibility_level IS DISTINCT FROM new.visibility_level))) EXECUTE FUNCTION insert_catalog_resource_sync_event();
@@ -30690,6 +30753,9 @@ ALTER TABLE ONLY ai_agent_version_attachments
 ALTER TABLE ONLY abuse_report_user_mentions
     ADD CONSTRAINT fk_088018ecd8 FOREIGN KEY (abuse_report_id) REFERENCES abuse_reports(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY merge_request_assignees
+    ADD CONSTRAINT fk_088f01d08d FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_request_assignment_events
     ADD CONSTRAINT fk_08f7602bfd FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE CASCADE;
 
@@ -30939,6 +31005,9 @@ ALTER TABLE ONLY ml_model_versions
 ALTER TABLE p_ci_builds
     ADD CONSTRAINT fk_3a9eaa254d_p FOREIGN KEY (partition_id, stage_id) REFERENCES p_ci_stages(partition_id, id) ON UPDATE CASCADE ON DELETE CASCADE;
 
+ALTER TABLE ONLY draft_notes
+    ADD CONSTRAINT fk_3ac2bcb746 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY agent_activity_events
     ADD CONSTRAINT fk_3af186389b FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE SET NULL;
 
@@ -31689,6 +31758,9 @@ ALTER TABLE p_ci_builds
 ALTER TABLE ONLY boards_epic_user_preferences
     ADD CONSTRAINT fk_d32c3d693c FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY vulnerability_state_transitions
+    ADD CONSTRAINT fk_d3ede71c58 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY ci_sources_pipelines
     ADD CONSTRAINT fk_d4e29af7d7 FOREIGN KEY (source_pipeline_id) REFERENCES ci_pipelines(id) ON DELETE CASCADE;
 
diff --git a/doc/administration/settings/usage_statistics.md b/doc/administration/settings/usage_statistics.md
index 72c5efbfe92..ec7a10c3940 100644
--- a/doc/administration/settings/usage_statistics.md
+++ b/doc/administration/settings/usage_statistics.md
@@ -18,7 +18,7 @@ For information about other tiers, see [Customer Product Usage Information](http
 
 ## Service Ping
 
-Service Ping is a process that collects and sends a weekly payload to GitLab Inc.
+Service Ping is a process that collects and sends a weekly payload to GitLab Inc. 
 For more information, see the [Service Ping guide](../../development/internal_analytics/service_ping/index.md). When Service Ping is enabled, GitLab gathers data from other instances and enables certain [instance-level analytics features](../../user/analytics/index.md)
 that are dependent on Service Ping.
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 308c2074627..f3490b641e3 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -34458,6 +34458,7 @@ Member role permission.
 | <a id="memberrolepermissionadmin_integrations"></a>`ADMIN_INTEGRATIONS` | Create, read, update, and delete integrations with external applications. |
 | <a id="memberrolepermissionadmin_merge_request"></a>`ADMIN_MERGE_REQUEST` | Allows approval of merge requests. |
 | <a id="memberrolepermissionadmin_push_rules"></a>`ADMIN_PUSH_RULES` | Configure push rules for repositories at the group or project level. |
+| <a id="memberrolepermissionadmin_runners"></a>`ADMIN_RUNNERS` | Create, view, edit, and delete group or project Runners. Includes configuring Runner settings. |
 | <a id="memberrolepermissionadmin_terraform_state"></a>`ADMIN_TERRAFORM_STATE` | Execute terraform commands, lock/unlock terraform state files, and remove file versions. |
 | <a id="memberrolepermissionadmin_vulnerability"></a>`ADMIN_VULNERABILITY` | Edit the vulnerability object, including the status and linking an issue. Includes the `read_vulnerability` permission actions. |
 | <a id="memberrolepermissionadmin_web_hook"></a>`ADMIN_WEB_HOOK` | Manage webhooks. |
diff --git a/doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ci_insights.md b/doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ci_insights.md
index 256f8a1eee3..7e8e048d1f4 100644
--- a/doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ci_insights.md
+++ b/doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ci_insights.md
@@ -64,7 +64,7 @@ Add a "Is master broken?" quick option that scans the last x pipelines on the ma
 
 ### Color scheme
 
-Rethink our current color schemes for data visuliaztion when it comes to pipelines statuses. We currently use the default visualization colors, but they don't actually match with that colors user have grown accustomed to for pipeline/jobs statuses. There is an opportunity here to help user better understand their data through more relevant color schemes and better visualization.
+Rethink our current color schemes for data visualization when it comes to pipelines statuses. We currently use the default visualization colors, but they don't actually match with that colors user have grown accustomed to for pipeline/jobs statuses. There is an opportunity here to help user better understand their data through more relevant color schemes and better visualization.
 
 ### Routing
 
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index 2c998b2d264..8fc05ddf32d 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -41,7 +41,7 @@ If your version of Elasticsearch or OpenSearch is incompatible, to prevent data
 a message is logged in the
 [`elasticsearch.log`](../../administration/logs/index.md#elasticsearchlog) file.
 
-If you are using a compatible version and after connecting to OpenSearch, you get the message `Elasticsearch version not compatible`, [unpause indexing](#unpause-indexing).
+If you are using a compatible version and after connecting to OpenSearch, you get the message `Elasticsearch version not compatible`, [resume indexing](#resume-indexing).
 
 ## System requirements
 
@@ -82,7 +82,7 @@ During an Elasticsearch upgrade, you must:
 - Pause indexing so changes can still be tracked.
 - Disable advanced search so searches do not fail with an `HTTP 500` error.
 
-When the Elasticsearch cluster is fully upgraded and active, [resume indexing](#unpause-indexing) and enable advanced search.
+When the Elasticsearch cluster is fully upgraded and active, [resume indexing](#resume-indexing) and enable advanced search.
 
 When you upgrade to GitLab 15.0 and later, you must use Elasticsearch 7.x and later.
 
@@ -212,9 +212,16 @@ you might have problems updating documents such as issues because your
 instance queues a job to index the change, but cannot find a valid
 Elasticsearch cluster.
 
-For GitLab instances with more than 50 GB of repository data, see [How to index large instances efficiently](#how-to-index-large-instances-efficiently).
+For GitLab instances with more than 50 GB of repository data, see [Index large instances efficiently](#index-large-instances-efficiently).
 
-### Enable with the **Index all projects** setting
+### Index all projects
+
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
 
 You can only use the **Index all projects** setting to perform
 initial indexing, not to re-create an index from scratch.
@@ -412,9 +419,16 @@ If you do not specify any namespace or project, only project records are indexed
 
 ## Enable custom language analyzers
 
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
+
 You can improve the language support for Chinese and Japanese languages by utilizing [`smartcn`](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-smartcn.html) and/or [`kuromoji`](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html) analysis plugins from Elastic.
 
-To enable languages support:
+To enable language support:
 
 1. Install the desired plugins, refer to [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/plugins/7.9/installation.html) for plugins installation instructions. The plugins must be installed on every node in the cluster, and each node must be restarted after installation. For a list of plugins, see the table later in this section.
 1. On the left sidebar, at the bottom, select **Admin Area**.
@@ -436,7 +450,14 @@ For guidance on what to install, see the following Elasticsearch language plugin
 
 ## Disable advanced search
 
-To disable the Elasticsearch integration:
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
+
+To disable advanced search in GitLab:
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
 1. Select **Settings > Search**.
@@ -452,7 +473,16 @@ To disable the Elasticsearch integration:
    bundle exec rake gitlab:elastic:delete_index RAILS_ENV=production
    ```
 
-## Unpause Indexing
+## Resume indexing
+
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
+
+To resume indexing:
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
 1. Select **Settings > Search**.
@@ -472,7 +502,14 @@ index alias to it which becomes the new `primary` index. At the end, we resume t
 
 You can use zero-downtime reindexing to configure index settings or mappings that cannot be changed without creating a new index and copying existing data. You should not use zero-downtime reindexing to fix missing data. Zero-downtime reindexing does not add data to the search cluster if the data is not already indexed. You must complete all [advanced search migrations](#advanced-search-migrations) before you start reindexing.
 
-### Trigger the reindex via the advanced search administration
+### Trigger reindexing
+
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
 
 To trigger the reindexing process:
 
@@ -492,6 +529,13 @@ While the reindexing is running, you can follow its progress under that same sec
 
 #### Elasticsearch zero-downtime reindexing
 
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
+
 1. On the left sidebar, at the bottom, select **Admin Area**.
 1. Select **Settings > Search**.
 1. Expand **Elasticsearch zero-downtime reindexing**, and you'll
@@ -526,11 +570,18 @@ The best value for this depends on your cluster size, whether you're willing
 to accept some degraded search performance during reindexing, and how important
 it is for the reindex to finish quickly and resume indexing.
 
-### Mark the most recent reindex job as failed and resume the indexing
+### Mark the most recent reindexing job as failed and resume indexing
 
-Sometimes, you might want to abandon the unfinished reindex job and resume the indexing. You can achieve this via the following steps:
+DETAILS:
+**Offering:** Self-managed
 
-1. Mark the most recent reindex job as failed:
+Prerequisites:
+
+- You must have administrator access to the instance.
+
+To abandon the unfinished reindexing job and resume indexing:
+
+1. Mark the most recent reindexing job as failed:
 
    ```shell
    # Omnibus installations
@@ -804,18 +855,24 @@ For single-node clusters, set the number of Elasticsearch replicas per index to
 For multi-node clusters, set the number of Elasticsearch replicas per index to `1` (each shard has one replica).
 The number must not be `0` because losing one node corrupts the index.
 
-### How to index large instances efficiently
+### Index large instances efficiently
 
-This section may be helpful in the event that the other
-[basic instructions](#enable-advanced-search) cause problems
-due to large volumes of data being indexed.
+DETAILS:
+**Offering:** Self-managed
+
+Prerequisites:
+
+- You must have administrator access to the instance.
 
 WARNING:
 Indexing a large instance generates a lot of Sidekiq jobs.
 Make sure to prepare for this task by having a
-[scalable setup](../../administration/reference_architectures/index.md) or creating
+[scalable setup](../../administration/reference_architectures/index.md) or by creating
 [extra Sidekiq processes](../../administration/sidekiq/extra_sidekiq_processes.md).
 
+If [enabling advanced search](#enable-advanced-search) causes problems
+due to large volumes of data being indexed, follow these steps:
+
 1. [Configure your Elasticsearch host and port](#enable-advanced-search).
 1. Create empty indices:
 
diff --git a/doc/integration/exact_code_search/zoekt.md b/doc/integration/exact_code_search/zoekt.md
index 9048a1cb796..e46389af446 100644
--- a/doc/integration/exact_code_search/zoekt.md
+++ b/doc/integration/exact_code_search/zoekt.md
@@ -21,11 +21,16 @@ For more information, see [epic 9404](https://gitlab.com/groups/gitlab-org/-/epi
 
 Zoekt is an open-source search engine designed specifically to search for code.
 
-With this integration, you can search for code faster and more efficiently.
+With this integration, you can use [exact code search](../../user/search/exact_code_search.md)
+instead of [advanced search](../../user/search/advanced_search.md) to search for code in GitLab.
 You can use regular expression and exact match modes to search for code in a group or repository.
 
 ## Enable exact code search
 
+Prerequisites:
+
+- You must have administrator access to the instance.
+
 To enable [exact code search](../../user/search/exact_code_search.md) in GitLab:
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
@@ -36,6 +41,10 @@ To enable [exact code search](../../user/search/exact_code_search.md) in GitLab:
 
 ## Pause indexing
 
+Prerequisites:
+
+- You must have administrator access to the instance.
+
 To pause indexing for [exact code search](../../user/search/exact_code_search.md):
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
diff --git a/doc/user/custom_roles/abilities.md b/doc/user/custom_roles/abilities.md
index fcb07659e29..5567c128964 100644
--- a/doc/user/custom_roles/abilities.md
+++ b/doc/user/custom_roles/abilities.md
@@ -62,6 +62,12 @@ These requirements are documented in the `Required permission` column in the fol
 |:-----|:------------|:------------------|:---------|:--------------|:---------|
 | [`admin_integrations`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154601) |  | Create, read, update, and delete integrations with external applications. | GitLab [17.1](https://gitlab.com/gitlab-org/gitlab/-/issues/460522) |  |  |
 
+## Runner
+
+| Name | Required permission | Description | Introduced in | Feature flag | Enabled in |
+|:-----|:------------|:------------------|:---------|:--------------|:---------|
+| [`admin_runners`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151825) |  | Create, view, edit, and delete group or project Runners. Includes configuring Runner settings. | GitLab [17.1](https://gitlab.com/gitlab-org/gitlab/-/issues/442851) | `custom_ability_admin_runners` |  |
+
 ## Secrets management
 
 | Name | Required permission | Description | Introduced in | Feature flag | Enabled in |
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 99733875db7..b423f219b06 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -309,7 +309,7 @@ To customize the time format:
 1. Under **Time format**, select either the **System**, **12-hour**, or **24-hour** option.
 1. Select **Save changes**.
 
-## Enable exact code search
+## Disable exact code search
 
 DETAILS:
 **Tier:** Premium, Ultimate
@@ -324,15 +324,17 @@ WARNING:
 This feature is in [beta](../../policy/experiment-beta-support.md#beta) and subject to change without notice.
 For more information, see [epic 9404](https://gitlab.com/groups/gitlab-org/-/epics/9404).
 
-You can use [exact code search](../search/exact_code_search.md) instead of
-[advanced search](../search/advanced_search.md) to search for code in GitLab.
+Prerequisites:
 
-To enable exact code search:
+- For [GitLab self-managed](../../subscriptions/self_managed/index.md), an administrator must
+  [enable exact code search](../../integration/exact_code_search/zoekt.md#enable-exact-code-search).
+
+To disable [exact code search](../../user/search/exact_code_search.md) in user preferences:
 
 1. On the left sidebar, select your avatar.
 1. Select **Preferences**.
 1. Go to the **Exact code search** section.
-1. Select the **Enable exact code search** checkbox.
+1. Clear the **Enable exact code search** checkbox.
 1. Select **Save changes**.
 
 ## User identities in CI job JSON web tokens
diff --git a/doc/user/search/exact_code_search.md b/doc/user/search/exact_code_search.md
index 563b8888333..2bba1b8aaa5 100644
--- a/doc/user/search/exact_code_search.md
+++ b/doc/user/search/exact_code_search.md
@@ -19,16 +19,19 @@ WARNING:
 This feature is in [beta](../../policy/experiment-beta-support.md#beta) and subject to change without notice.
 For more information, see [epic 9404](https://gitlab.com/groups/gitlab-org/-/epics/9404).
 
-Prerequisites:
-
-- You must [enable exact code search](../profile/preferences.md#enable-exact-code-search) in user preferences.
-
 With exact code search, you can use regular expression and exact match modes
 to search for code in all GitLab or in a specific project.
 
 Exact code search is powered by [Zoekt](https://github.com/sourcegraph/zoekt)
 and is used by default in groups where the feature is enabled.
 
+## Enable exact code search
+
+- For [GitLab.com](../../subscriptions/gitlab_com/index.md),
+  exact code search is enabled in paid subscriptions.
+- For [GitLab self-managed](../../subscriptions/self_managed/index.md), an administrator must
+  [enable exact code search](../../integration/exact_code_search/zoekt.md#enable-exact-code-search).
+
 ## Zoekt search API
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143666) in GitLab 16.9 [with a flag](../../administration/feature_flags.md) named `zoekt_search_api`. Enabled by default.
diff --git a/lib/gitlab/background_migration/backfill_draft_notes_project_id.rb b/lib/gitlab/background_migration/backfill_draft_notes_project_id.rb
new file mode 100644
index 00000000000..7ab4d181bc6
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_draft_notes_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillDraftNotesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_draft_notes_project_id
+      feature_category :code_review_workflow
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id.rb b/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id.rb
new file mode 100644
index 00000000000..f8af99c33a1
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillMergeRequestAssigneesProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_merge_request_assignees_project_id
+      feature_category :code_review_workflow
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id.rb b/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id.rb
new file mode 100644
index 00000000000..726770fd50e
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    class BackfillVulnerabilityStateTransitionsProjectId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_vulnerability_state_transitions_project_id
+      feature_category :vulnerability_management
+    end
+  end
+end
diff --git a/rubocop/cop/rspec/modify_sidekiq_middleware.rb b/rubocop/cop/rspec/modify_sidekiq_middleware.rb
index 2e27288933f..3e4f2bde5d0 100644
--- a/rubocop/cop/rspec/modify_sidekiq_middleware.rb
+++ b/rubocop/cop/rspec/modify_sidekiq_middleware.rb
@@ -41,7 +41,7 @@ module RuboCop
 
           add_offense(node) do |corrector|
             corrector.replace(node.loc.expression,
-                              'with_sidekiq_server_middleware')
+              'with_sidekiq_server_middleware')
           end
         end
       end
diff --git a/scripts/packages/automated_cleanup.rb b/scripts/packages/automated_cleanup.rb
index 56281b1a993..2a67928fc87 100755
--- a/scripts/packages/automated_cleanup.rb
+++ b/scripts/packages/automated_cleanup.rb
@@ -39,9 +39,9 @@ module Packages
       puts "Checking for '#{package_name}' packages created at least #{days_for_delete} days ago..."
 
       gitlab.project_packages(project_path,
-                              package_type: 'generic',
-                              package_name: package_name,
-                              per_page: PACKAGES_PER_PAGE).auto_paginate do |package|
+        package_type: 'generic',
+        package_name: package_name,
+        per_page: PACKAGES_PER_PAGE).auto_paginate do |package|
         next unless package.name == package_name # the search is fuzzy, so we better check the actual package name
 
         if old_enough(package, days_for_delete) && not_recently_downloaded(package, days_for_delete)
diff --git a/scripts/rubocop-parse b/scripts/rubocop-parse
index c99d66e99ad..202d5cf0b40 100755
--- a/scripts/rubocop-parse
+++ b/scripts/rubocop-parse
@@ -107,7 +107,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on('-v RUBY_VERSION', '--ruby-version RUBY_VERSION',
-          'Parse as Ruby would. Defaults to RuboCop TargetRubyVersion setting.') do |ruby_version|
+    'Parse as Ruby would. Defaults to RuboCop TargetRubyVersion setting.') do |ruby_version|
     Helper.ruby_version = Float(ruby_version)
   end
 
diff --git a/sidekiq_cluster/sidekiq_cluster.rb b/sidekiq_cluster/sidekiq_cluster.rb
index 2ad6efbc3af..47a81d3143b 100644
--- a/sidekiq_cluster/sidekiq_cluster.rb
+++ b/sidekiq_cluster/sidekiq_cluster.rb
@@ -39,11 +39,11 @@ module Gitlab
     def self.start(queues, env: :development, directory: Dir.pwd, concurrency: 20, timeout: DEFAULT_SOFT_TIMEOUT_SECONDS, dryrun: false)
       queues.map.with_index do |pair, index|
         start_sidekiq(pair, env: env,
-                            directory: directory,
-                            concurrency: concurrency,
-                            worker_id: index,
-                            timeout: timeout,
-                            dryrun: dryrun)
+          directory: directory,
+          concurrency: concurrency,
+          worker_id: index,
+          timeout: timeout,
+          dryrun: dryrun)
       end
     end
 
diff --git a/spec/benchmarks/banzai_benchmark.rb b/spec/benchmarks/banzai_benchmark.rb
index 66572ad8cf5..fcea7e6fabe 100644
--- a/spec/benchmarks/banzai_benchmark.rb
+++ b/spec/benchmarks/banzai_benchmark.rb
@@ -122,15 +122,15 @@ RSpec.describe 'GitLab Markdown Benchmark', :aggregate_failures, feature_categor
 
         x.report('Markdown-glfm') do
           filter = filter_klass.new(filter_source[filter_klass][:input_text],
-                                    context.merge(markdown_engine: glfm_engine),
-                                    filter_source[filter_klass][:input_result])
+            context.merge(markdown_engine: glfm_engine),
+            filter_source[filter_klass][:input_result])
           filter.call
         end
 
         x.report('Markdown-cmark') do
           filter = filter_klass.new(filter_source[filter_klass][:input_text],
-                                    context.merge(markdown_engine: cmark_engine),
-                                    filter_source[filter_klass][:input_result])
+            context.merge(markdown_engine: cmark_engine),
+            filter_source[filter_klass][:input_result])
           filter.call
         end
 
@@ -197,8 +197,8 @@ RSpec.describe 'GitLab Markdown Benchmark', :aggregate_failures, feature_categor
 
         x.report(label) do
           filter = filter_klass.new(filter_source[filter_klass][:input_text],
-                                    context,
-                                    filter_source[filter_klass][:input_result])
+            context,
+            filter_source[filter_klass][:input_result])
           filter.call
         end
       end
diff --git a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
index 3fc9be3577b..f0fdab362b2 100644
--- a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
+++ b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Blob Header Filepath rendering matches the snapshot 1`] = `
 <div
-  class="d-flex file-header-content gl-align-items-center gl-leading-1"
+  class="file-header-content gl-align-items-center gl-flex gl-leading-1"
 >
   <file-icon-stub
     aria-hidden="true"
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
index 2be22cd0993..0a91ad0067b 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
@@ -37,7 +37,7 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
         value="private"
       >
         <div
-          class="gl-align-items-center gl-display-flex"
+          class="gl-flex gl-items-center"
         >
           <gl-icon-stub
             name="lock"
@@ -58,7 +58,7 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
         value="internal"
       >
         <div
-          class="gl-align-items-center gl-display-flex"
+          class="gl-flex gl-items-center"
         >
           <gl-icon-stub
             name="shield"
@@ -79,7 +79,7 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
         value="public"
       >
         <div
-          class="gl-align-items-center gl-display-flex"
+          class="gl-flex gl-items-center"
         >
           <gl-icon-stub
             name="earth"
diff --git a/spec/graphql/features/authorization_spec.rb b/spec/graphql/features/authorization_spec.rb
index d3a7df8cb00..1f21c048961 100644
--- a/spec/graphql/features/authorization_spec.rb
+++ b/spec/graphql/features/authorization_spec.rb
@@ -82,9 +82,9 @@ RSpec.describe 'DeclarativePolicy authorization in GraphQL ' do
         permissions = permission_collection
         query_factory do |qt|
           qt.field :item, type,
-                   null: true,
-                   resolver: new_resolver(test_object),
-                   authorize: permissions
+            null: true,
+            resolver: new_resolver(test_object),
+            authorize: permissions
         end
       end
 
@@ -201,9 +201,9 @@ RSpec.describe 'DeclarativePolicy authorization in GraphQL ' do
     let(:query_type) do
       query_factory do |query|
         query.field :item, type,
-                    null: true,
-                    resolver: resolver,
-                    authorize: permission_2
+          null: true,
+          resolver: resolver,
+          authorize: permission_2
       end
     end
 
@@ -261,8 +261,8 @@ RSpec.describe 'DeclarativePolicy authorization in GraphQL ' do
         let(:query_type) do
           query_factory do |query|
             query.field :item, type,
-                        null: true,
-                        resolver: resolver
+              null: true,
+              resolver: resolver
           end
         end
 
@@ -387,8 +387,8 @@ RSpec.describe 'DeclarativePolicy authorization in GraphQL ' do
       type_factory do |type|
         type.graphql_name 'FakeProjectType'
         type.field :test_issues, field_type,
-                   null: false,
-                   resolver: new_resolver(issues)
+          null: false,
+          resolver: new_resolver(issues)
       end
     end
 
diff --git a/spec/initializers/secret_token_spec.rb b/spec/initializers/secret_token_spec.rb
index 5c39bee16b2..1520cbb4ac2 100644
--- a/spec/initializers/secret_token_spec.rb
+++ b/spec/initializers/secret_token_spec.rb
@@ -36,12 +36,12 @@ RSpec.describe 'create_tokens' do
         new_secrets = secrets.keys - acknowledged_secrets
 
         expect(new_secrets).to be_empty,
-         <<~EOS
+          <<~EOS
            CAUTION:
            It looks like you have just added new secret(s) #{new_secrets.inspect} to the secrets.yml.
            Please read the development guide for GitLab secrets at doc/development/application_secrets.md before you proceed this change.
            If you're absolutely sure that the change is safe, please add the new secrets to the 'acknowledged_secrets' in order to silence this warning.
-         EOS
+          EOS
       end
     end
   end
diff --git a/spec/lib/api/every_api_endpoint_spec.rb b/spec/lib/api/every_api_endpoint_spec.rb
index f01fe5a2c9a..b4133818d15 100644
--- a/spec/lib/api/every_api_endpoint_spec.rb
+++ b/spec/lib/api/every_api_endpoint_spec.rb
@@ -65,7 +65,7 @@ RSpec.describe 'Every API endpoint', feature_category: :scalability do
         non_existing_used_paths = used_paths - existing_paths
 
         expect(non_existing_used_paths).to be_empty,
-                                           "#{klass} used #{non_existing_used_paths} to define feature category, but the route does not exist"
+          "#{klass} used #{non_existing_used_paths} to define feature category, but the route does not exist"
       end
     end
   end
diff --git a/spec/lib/atlassian/jira_connect/client_spec.rb b/spec/lib/atlassian/jira_connect/client_spec.rb
index e1159b9fab2..50ec28ea760 100644
--- a/spec/lib/atlassian/jira_connect/client_spec.rb
+++ b/spec/lib/atlassian/jira_connect/client_spec.rb
@@ -441,7 +441,7 @@ RSpec.describe Atlassian::JiraConnect::Client, feature_category: :integrations d
 
       expect do
         subject.send(:store_dev_info, project: project,
-                                      merge_requests: merge_requests)
+          merge_requests: merge_requests)
       end.not_to exceed_query_limit(control)
     end
   end
diff --git a/spec/lib/gitlab/background_migration/backfill_draft_notes_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_draft_notes_project_id_spec.rb
new file mode 100644
index 00000000000..dea05a800ad
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_draft_notes_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillDraftNotesProjectId,
+  feature_category: :code_review_workflow,
+  schema: 20240605090452 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :draft_notes }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :merge_requests }
+    let(:backfill_via_column) { :target_project_id }
+    let(:backfill_via_foreign_key) { :merge_request_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id_spec.rb
new file mode 100644
index 00000000000..cf1232f11b8
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_merge_request_assignees_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillMergeRequestAssigneesProjectId,
+  feature_category: :code_review_workflow,
+  schema: 20240605193138 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :merge_request_assignees }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :merge_requests }
+    let(:backfill_via_column) { :target_project_id }
+    let(:backfill_via_foreign_key) { :merge_request_id }
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id_spec.rb
new file mode 100644
index 00000000000..2c82eb32f34
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_vulnerability_state_transitions_project_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillVulnerabilityStateTransitionsProjectId,
+  feature_category: :vulnerability_management,
+  schema: 20240605193703 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :vulnerability_state_transitions }
+    let(:backfill_column) { :project_id }
+    let(:backfill_via_table) { :vulnerabilities }
+    let(:backfill_via_column) { :project_id }
+    let(:backfill_via_foreign_key) { :vulnerability_id }
+  end
+end
diff --git a/spec/migrations/20240605090456_queue_backfill_draft_notes_project_id_spec.rb b/spec/migrations/20240605090456_queue_backfill_draft_notes_project_id_spec.rb
new file mode 100644
index 00000000000..e7048da37a1
--- /dev/null
+++ b/spec/migrations/20240605090456_queue_backfill_draft_notes_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillDraftNotesProjectId, feature_category: :code_review_workflow 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: :draft_notes,
+          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,
+            :merge_requests,
+            :target_project_id,
+            :merge_request_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20240605193142_queue_backfill_merge_request_assignees_project_id_spec.rb b/spec/migrations/20240605193142_queue_backfill_merge_request_assignees_project_id_spec.rb
new file mode 100644
index 00000000000..65588c88f13
--- /dev/null
+++ b/spec/migrations/20240605193142_queue_backfill_merge_request_assignees_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillMergeRequestAssigneesProjectId, feature_category: :code_review_workflow 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: :merge_request_assignees,
+          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,
+            :merge_requests,
+            :target_project_id,
+            :merge_request_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/migrations/20240605193707_queue_backfill_vulnerability_state_transitions_project_id_spec.rb b/spec/migrations/20240605193707_queue_backfill_vulnerability_state_transitions_project_id_spec.rb
new file mode 100644
index 00000000000..78298e5d583
--- /dev/null
+++ b/spec/migrations/20240605193707_queue_backfill_vulnerability_state_transitions_project_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillVulnerabilityStateTransitionsProjectId, feature_category: :vulnerability_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: :vulnerability_state_transitions,
+          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,
+            :vulnerabilities,
+            :project_id,
+            :vulnerability_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/policies/namespaces/user_namespace_policy_spec.rb b/spec/policies/namespaces/user_namespace_policy_spec.rb
index b4fbc7e0417..c88794ffe01 100644
--- a/spec/policies/namespaces/user_namespace_policy_spec.rb
+++ b/spec/policies/namespaces/user_namespace_policy_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Namespaces::UserNamespacePolicy, feature_category: :groups_and_pr
   let_it_be(:admin) { create(:admin) }
   let_it_be(:namespace) { create(:user_namespace, owner: owner) }
 
-  let(:owner_permissions) { [:owner_access, :create_projects, :admin_namespace, :read_namespace, :read_namespace_via_membership, :read_statistics, :transfer_projects, :admin_package, :read_billing, :edit_billing, :import_projects] }
+  let(:owner_permissions) { [:owner_access, :create_projects, :admin_runner, :admin_namespace, :read_namespace, :read_namespace_via_membership, :read_statistics, :transfer_projects, :admin_package, :read_billing, :edit_billing, :import_projects] }
 
   subject { described_class.new(current_user, namespace) }
 
diff --git a/spec/support/shared_contexts/policies/group_policy_shared_context.rb b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
index 934ac8d9ff4..b3e0b6e27ee 100644
--- a/spec/support/shared_contexts/policies/group_policy_shared_context.rb
+++ b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
@@ -78,6 +78,7 @@ RSpec.shared_context 'GroupPolicy context' do
       admin_namespace
       admin_group_member
       admin_package
+      admin_runner
       change_visibility_level
       set_note_created_at
       create_subgroup
diff --git a/spec/support/shared_contexts/policies/project_policy_shared_context.rb b/spec/support/shared_contexts/policies/project_policy_shared_context.rb
index 984584f72a8..452fd74b347 100644
--- a/spec/support/shared_contexts/policies/project_policy_shared_context.rb
+++ b/spec/support/shared_contexts/policies/project_policy_shared_context.rb
@@ -67,7 +67,7 @@ RSpec.shared_context 'ProjectPolicy context' do
     %i[
       add_cluster admin_build admin_commit_status admin_container_image
       admin_cicd_variables admin_deployment admin_environment admin_note admin_pipeline
-      admin_project admin_project_member admin_push_rules admin_snippet admin_terraform_state
+      admin_project admin_project_member admin_push_rules admin_runner admin_snippet admin_terraform_state
       admin_wiki create_deploy_token destroy_deploy_token manage_deploy_tokens
       push_to_delete_protected_branch read_deploy_token update_snippet
       destroy_upload admin_member_access_request rename_project manage_merge_request_settings