diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index da66c9d8f5e..000e1a36573 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -2,26 +2,6 @@
 # Cop supports --autocorrect.
 Layout/FirstHashElementIndentation:
   Exclude:
-    - 'ee/spec/services/projects/disable_deploy_key_service_spec.rb'
-    - 'ee/spec/services/projects/enable_deploy_key_service_spec.rb'
-    - 'ee/spec/services/projects/group_links/create_service_spec.rb'
-    - 'ee/spec/services/projects/group_links/destroy_service_spec.rb'
-    - 'ee/spec/services/projects/transfer_service_spec.rb'
-    - 'ee/spec/services/security/security_orchestration_policies/create_pipeline_service_spec.rb'
-    - 'ee/spec/services/security/token_revocation_service_spec.rb'
-    - 'ee/spec/services/security/track_scan_service_spec.rb'
-    - 'ee/spec/services/timebox_report_service_spec.rb'
-    - 'lib/banzai/filter/playable_link_filter.rb'
-    - 'lib/gitlab/application_rate_limiter.rb'
-    - 'lib/gitlab/asciidoc.rb'
-    - 'lib/gitlab/asciidoc/include_processor.rb'
-    - 'lib/gitlab/auth/otp/strategies/forti_token_cloud.rb'
-    - 'lib/gitlab/ci/config/entry/processable.rb'
-    - 'lib/gitlab/database/migrations/observers/query_details.rb'
-    - 'lib/gitlab/database/migrations/observers/transaction_duration.rb'
-    - 'lib/gitlab/hook_data/release_builder.rb'
-    - 'lib/gitlab/quick_actions/issuable_actions.rb'
-    - 'qa/qa/resource/snippet.rb'
     - 'spec/controllers/concerns/issuable_collections_spec.rb'
     - 'spec/controllers/groups/group_members_controller_spec.rb'
     - 'spec/controllers/import/manifest_controller_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 2ebe574a185..6e0c79ea10d 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1817,7 +1817,6 @@ Layout/LineLength:
     - 'ee/spec/support/shared_examples/services/vulnerabilities/calls_vulnerability_statistics_utility_services_in_order.rb'
     - 'ee/spec/tasks/geo_rake_spec.rb'
     - 'ee/spec/validators/json_schema_validator_spec.rb'
-    - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'ee/spec/views/admin/application_settings/general.html.haml_spec.rb'
     - 'ee/spec/views/admin/dashboard/index.html.haml_spec.rb'
     - 'ee/spec/views/groups/security/discover/show.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml
index 966440825f2..c2635d0cea8 100644
--- a/.rubocop_todo/rspec/be_eq.yml
+++ b/.rubocop_todo/rspec/be_eq.yml
@@ -137,7 +137,6 @@ RSpec/BeEq:
     - 'ee/spec/lib/gitlab/database/desired_sharding_key_spec.rb'
     - 'ee/spec/lib/gitlab/duo/chat/react_executor_spec.rb'
     - 'ee/spec/lib/gitlab/duo_workflow/client_spec.rb'
-    - 'ee/spec/lib/gitlab/elastic/client_spec.rb'
     - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb'
     - 'ee/spec/lib/gitlab/elastic/elasticsearch_enabled_cache_spec.rb'
     - 'ee/spec/lib/gitlab/exclusive_lease_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 07f31532e7b..3558143b412 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -775,7 +775,6 @@ RSpec/ContextWording:
     - 'ee/spec/support/shared_examples/services/search_service_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/update_issuable_health_status_shared_examples.rb'
     - 'ee/spec/tasks/gitlab/license_rake_spec.rb'
-    - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'ee/spec/views/groups/edit.html.haml_spec.rb'
     - 'ee/spec/views/layouts/header/_read_only_banner.html.haml_spec.rb'
     - 'ee/spec/views/profiles/preferences/show.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml
index deb0d8ec523..9e8a086a831 100644
--- a/.rubocop_todo/rspec/receive_messages.yml
+++ b/.rubocop_todo/rspec/receive_messages.yml
@@ -174,7 +174,6 @@ RSpec/ReceiveMessages:
     - 'ee/spec/support/shared_examples/models/concerns/verifiable_replicator_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/audit_events/streaming/headers_operations_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/base_sync_service_shared_examples.rb'
-    - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'ee/spec/views/admin/dashboard/index.html.haml_spec.rb'
     - 'ee/spec/views/devise/registrations/new.html.haml_spec.rb'
     - 'ee/spec/views/devise/sessions/new.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml
index 2b92431210c..db93f48900f 100644
--- a/.rubocop_todo/rspec/return_from_stub.yml
+++ b/.rubocop_todo/rspec/return_from_stub.yml
@@ -29,7 +29,6 @@ RSpec/ReturnFromStub:
     - 'ee/spec/support/shared_examples/services/base_sync_service_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/geo_event_store_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/merge_merge_requests_shared_examples.rb'
-    - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'ee/spec/views/admin/application_settings/_git_abuse_rate_limit.html.haml_spec.rb'
     - 'ee/spec/views/admin/groups/_form.html.haml_spec.rb'
     - 'ee/spec/views/shared/_mirror_update_button.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_double_reference.yml b/.rubocop_todo/rspec/verified_double_reference.yml
index 68d04368431..9121e907448 100644
--- a/.rubocop_todo/rspec/verified_double_reference.yml
+++ b/.rubocop_todo/rspec/verified_double_reference.yml
@@ -65,7 +65,6 @@ RSpec/VerifiedDoubleReference:
     - 'ee/spec/support/shared_examples/lib/ai/context/dependencies/config_files/config_file_shared_examples.rb'
     - 'ee/spec/support/shared_examples/lib/gitlab/llm/anthropic/client_shared_examples.rb'
     - 'ee/spec/tasks/gitlab/license_rake_spec.rb'
-    - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'ee/spec/views/groups/settings/_enforce_ssh_certificates.html.haml_spec.rb'
     - 'ee/spec/workers/analytics/devops_adoption/create_snapshot_worker_spec.rb'
     - 'ee/spec/workers/analytics/value_stream_dashboard/count_worker_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index edd572060b7..26a3a5cb550 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -52,7 +52,6 @@ RSpec/VerifiedDoubles:
     - 'ee/spec/lib/gitlab/code_owners/groups_loader_spec.rb'
     - 'ee/spec/lib/gitlab/code_owners/users_loader_spec.rb'
     - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb'
-    - 'ee/spec/lib/gitlab/elastic/client_spec.rb'
     - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb'
     - 'ee/spec/lib/gitlab/geo/git_ssh_proxy_spec.rb'
     - 'ee/spec/lib/gitlab/geo/log_cursor/lease_spec.rb'
diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue
index bd25be8d48f..2cd24137259 100644
--- a/app/assets/javascripts/boards/components/board_card_inner.vue
+++ b/app/assets/javascripts/boards/components/board_card_inner.vue
@@ -13,7 +13,7 @@ import IssueMilestone from '~/issuable/components/issue_milestone.vue';
 import {
   LINKED_CATEGORIES_MAP,
   STATE_CLOSED,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
 } from '~/work_items/constants';
 import WorkItemRelationshipIcons from '~/work_items/components/shared/work_item_relationship_icons.vue';
 import { ListType } from '../constants';
@@ -180,7 +180,7 @@ export default {
       return !this.disabled && this.list.listType !== ListType.closed;
     },
     workItemType() {
-      return this.isEpicBoard ? WORK_ITEM_TYPE_VALUE_EPIC : this.item.type;
+      return this.isEpicBoard ? WORK_ITEM_TYPE_NAME_EPIC : this.item.type;
     },
     workItemDrawerEnabled() {
       if (gon.current_user_use_work_items_view) return true;
diff --git a/app/assets/javascripts/issues/constants.js b/app/assets/javascripts/issues/constants.js
index 4f5086fcd76..e9a94fd4ec8 100644
--- a/app/assets/javascripts/issues/constants.js
+++ b/app/assets/javascripts/issues/constants.js
@@ -1,8 +1,8 @@
 import { __ } from '~/locale';
 import {
-  WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_KEY_RESULT,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_TASK,
 } from '~/work_items/constants';
 
 export const STATUS_ALL = 'all';
@@ -47,9 +47,9 @@ export const issuableTypeText = {
   [TYPE_ALERT]: __('alert'),
   [TYPE_INCIDENT]: __('incident'),
   [TYPE_TEST_CASE]: __('test case'),
-  [WORK_ITEM_TYPE_VALUE_KEY_RESULT]: __('key result'),
-  [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: __('objective'),
-  [WORK_ITEM_TYPE_VALUE_TASK]: __('task'),
+  [WORK_ITEM_TYPE_NAME_KEY_RESULT]: __('key result'),
+  [WORK_ITEM_TYPE_NAME_OBJECTIVE]: __('objective'),
+  [WORK_ITEM_TYPE_NAME_TASK]: __('task'),
 };
 
 const SHIFT_KEY = 16;
diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue
index 2f653800265..b034a7a2708 100644
--- a/app/assets/javascripts/issues/show/components/description.vue
+++ b/app/assets/javascripts/issues/show/components/description.vue
@@ -20,7 +20,7 @@ import {
   sprintfWorkItem,
   I18N_WORK_ITEM_ERROR_CREATING,
   I18N_WORK_ITEM_ERROR_DELETING,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_TASK,
 } from '~/work_items/constants';
 import { renderGFM } from '~/behaviors/markdown/render_gfm';
 import eventHub from '../event_hub';
@@ -121,7 +121,7 @@ export default {
   },
   computed: {
     taskWorkItemTypeId() {
-      return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_VALUE_TASK)?.id;
+      return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_NAME_TASK)?.id;
     },
     issueGid() {
       return this.issueId ? convertToGraphQLId(TYPENAME_WORK_ITEM, this.issueId) : null;
@@ -382,7 +382,7 @@ export default {
     },
     showAlert(message, error) {
       createAlert({
-        message: sprintfWorkItem(message, WORK_ITEM_TYPE_VALUE_TASK),
+        message: sprintfWorkItem(message, WORK_ITEM_TYPE_NAME_TASK),
         error,
         captureError: true,
       });
diff --git a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
index 9362c87a95c..34c99db435a 100644
--- a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
+++ b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
@@ -1,14 +1,14 @@
 <script>
 import { GlDisclosureDropdown, GlDisclosureDropdownItem, GlTooltipDirective } from '@gitlab/ui';
 import { TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants';
-import { WORK_ITEM_TYPE_VALUE_EPIC, WORK_ITEM_TYPE_VALUE_ISSUE } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_NAME_EPIC, WORK_ITEM_TYPE_NAME_ISSUE } from '~/work_items/constants';
 import eventHub from '../event_hub';
 
 const allowedTypes = [
   TYPE_INCIDENT,
   TYPE_ISSUE,
-  WORK_ITEM_TYPE_VALUE_EPIC,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_EPIC,
+  WORK_ITEM_TYPE_NAME_ISSUE,
 ];
 
 export default {
diff --git a/app/assets/javascripts/pipeline_wizard/templates/pages.yml b/app/assets/javascripts/pipeline_wizard/templates/pages.yml
index 7b352784c4b..a703e743ea4 100644
--- a/app/assets/javascripts/pipeline_wizard/templates/pages.yml
+++ b/app/assets/javascripts/pipeline_wizard/templates/pages.yml
@@ -1,6 +1,6 @@
 id: gitlab/pages
 title: Get started with GitLab Pages
-description: "Use GitLab Pages to deploy your static website. Follow these steps to create the configuration file, .gitlab-ci.yml, and start a pipeline to deploy the site."
+description: 'Use GitLab Pages to deploy your static website. Follow these steps to create the configuration file, .gitlab-ci.yml, and start a pipeline to deploy the site.'
 steps:
   - inputs:
       - label: Select your build image
@@ -10,42 +10,43 @@ steps:
         widget: text
         target: $BUILD_IMAGE
         required: true
-        pattern: "(?:[a-z]+/)?([a-z]+)(?::[0-9]+)?"
+        pattern: '(?:[a-z]+/)?([a-z]+)(?::[0-9]+)?'
         invalid-feedback: Please enter a valid docker image
-      - widget: checklist
-        items:
-          - text: The application files are in the `public` folder
-            help: GitLab Pages publishes files in the public folder only. If needed, change your jobs to send output to this folder.
+      - label: Choose a directory to publish
+        monospace: true
+        required: true
+        widget: text
+        default: public
+        description: 'Enter a project directory to publish. The default is "public".'
+        target: $DIRECTORY
     template:
       # The Docker image that will be used to build your app
       image: $BUILD_IMAGE
-  - inputs:
-      - label: Installation Steps
-        monospace: true
-        description: "Enter steps to set up a local build environment, like installing dependencies."
-        placeholder: npm ci
-        widget: list
-        target: $INSTALLATION_STEPS
-    template:
-      # Functions that should be executed before the build script is run
-      before_script: $INSTALLATION_STEPS
-  - inputs:
-      - label: Build Steps
-        monospace: true
-        description: "Enter steps to build a production version of your application."
-        widget: list
-        target: $BUILD_STEPS
-    template:
-
-      pages:
-        script: $BUILD_STEPS
-
-        artifacts:
-          paths:
-            # The folder that contains the files to be exposed at the Page URL
-            - public
-
+      create-pages:
+        pages:
+          # The folder that contains the files to be exposed at the Page URL
+          publish: $DIRECTORY
         rules:
           # This ensures that only pushes to the default branch will trigger
           # a pages deploy
           - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+  - inputs:
+      - label: Installation Steps
+        monospace: true
+        description: 'Enter steps to set up a local build environment, like installing dependencies.'
+        placeholder: npm ci
+        widget: list
+        target: $INSTALLATION_STEPS
+    template:
+      create-pages:
+        # Functions that should be executed before the build script is run
+        before_script: $INSTALLATION_STEPS
+  - inputs:
+      - label: Build Steps
+        monospace: true
+        description: 'Enter steps to build a production version of your application.'
+        widget: list
+        target: $BUILD_STEPS
+    template:
+      create-pages:
+        script: $BUILD_STEPS
diff --git a/app/assets/javascripts/repository/components/header_area/blob_repository_actions_group.vue b/app/assets/javascripts/repository/components/header_area/blob_repository_actions_group.vue
index cdfcf825717..4a2c773110d 100644
--- a/app/assets/javascripts/repository/components/header_area/blob_repository_actions_group.vue
+++ b/app/assets/javascripts/repository/components/header_area/blob_repository_actions_group.vue
@@ -1,28 +1,19 @@
 <script>
-import Vue from 'vue';
-import { GlDisclosureDropdownGroup, GlDisclosureDropdownItem, GlToast } from '@gitlab/ui';
+import { GlDisclosureDropdownGroup, GlDisclosureDropdownItem } from '@gitlab/ui';
 import { __ } from '~/locale';
 import Shortcuts from '~/behaviors/shortcuts/shortcuts';
-import {
-  keysFor,
-  PROJECT_FILES_GO_TO_PERMALINK,
-  START_SEARCH_PROJECT_FILE,
-} from '~/behaviors/shortcuts/keybindings';
-import { Mousetrap } from '~/lib/mousetrap';
+import { keysFor, START_SEARCH_PROJECT_FILE } from '~/behaviors/shortcuts/keybindings';
 import { shouldDisableShortcuts } from '~/behaviors/shortcuts/shortcuts_toggle';
-import { getBaseURL, relativePathToAbsolute } from '~/lib/utils/url_utility';
 import { InternalEvents } from '~/tracking';
 import { FIND_FILE_BUTTON_CLICK } from '~/tracking/constants';
-import { lineState } from '~/blob/state';
-import { getPageParamValue, getPageSearchString } from '~/blob/utils';
 import { showBlameButton } from '~/repository/utils/storage_info_utils';
-
-Vue.use(GlToast);
+import PermalinkDropdownItem from '~/repository/components/header_area/permalink_dropdown_item.vue';
 
 export default {
   components: {
     GlDisclosureDropdownGroup,
     GlDisclosureDropdownItem,
+    PermalinkDropdownItem,
   },
   inject: ['blobInfo'],
   props: {
@@ -35,21 +26,9 @@ export default {
     findFileShortcutKey() {
       return keysFor(START_SEARCH_PROJECT_FILE)[0];
     },
-    permalinkShortcutKey() {
-      return keysFor(PROJECT_FILES_GO_TO_PERMALINK)[0];
-    },
     shortcutsDisabled() {
       return shouldDisableShortcuts();
     },
-    absolutePermalinkPath() {
-      const baseAbsolutePath = relativePathToAbsolute(this.permalinkPath, getBaseURL());
-      if (lineState.currentLineNumber) {
-        const page = getPageParamValue(lineState.currentLineNumber);
-        const searchString = getPageSearchString(baseAbsolutePath, page);
-        return `${baseAbsolutePath}${searchString}#L${lineState.currentLineNumber}`;
-      }
-      return baseAbsolutePath;
-    },
     blameItem() {
       return {
         text: __('Blame'),
@@ -63,25 +42,11 @@ export default {
       return showBlameButton(this.blobInfo);
     },
   },
-  mounted() {
-    Mousetrap.bind(keysFor(PROJECT_FILES_GO_TO_PERMALINK), this.triggerCopyPermalink);
-  },
-  beforeDestroy() {
-    Mousetrap.unbind(keysFor(PROJECT_FILES_GO_TO_PERMALINK));
-  },
   methods: {
     handleFindFile() {
       InternalEvents.trackEvent(FIND_FILE_BUTTON_CLICK);
       Shortcuts.focusSearchFile();
     },
-    triggerCopyPermalink() {
-      const buttonElement = this.$refs.copyPermalinkButton.$el;
-      buttonElement.click();
-      this.onCopyPermalink();
-    },
-    onCopyPermalink() {
-      this.$toast.show(__('Permalink copied to clipboard.'));
-    },
   },
 };
 </script>
@@ -109,22 +74,6 @@ export default {
       class="js-blob-blame-link sm:gl-hidden"
       data-testid="blame-dropdown-item"
     />
-    <gl-disclosure-dropdown-item
-      ref="copyPermalinkButton"
-      :aria-keyshortcuts="permalinkShortcutKey"
-      data-testid="permalink"
-      :data-clipboard-text="absolutePermalinkPath"
-      data-clipboard-handle-tooltip="false"
-      @action="onCopyPermalink"
-    >
-      <template #list-item>
-        <span class="gl-flex gl-items-center gl-justify-between">
-          <span>{{ __('Copy permalink') }}</span>
-          <kbd v-if="permalinkShortcutKey && !shortcutsDisabled" class="flat">{{
-            permalinkShortcutKey
-          }}</kbd>
-        </span>
-      </template>
-    </gl-disclosure-dropdown-item>
+    <permalink-dropdown-item :permalink-path="permalinkPath" />
   </gl-disclosure-dropdown-group>
 </template>
diff --git a/app/assets/javascripts/repository/components/header_area/permalink_dropdown_item.vue b/app/assets/javascripts/repository/components/header_area/permalink_dropdown_item.vue
new file mode 100644
index 00000000000..b692c37138b
--- /dev/null
+++ b/app/assets/javascripts/repository/components/header_area/permalink_dropdown_item.vue
@@ -0,0 +1,78 @@
+<script>
+import Vue from 'vue';
+import { GlDisclosureDropdownItem, GlToast } from '@gitlab/ui';
+import { __ } from '~/locale';
+import { keysFor, PROJECT_FILES_GO_TO_PERMALINK } from '~/behaviors/shortcuts/keybindings';
+import { Mousetrap } from '~/lib/mousetrap';
+import { shouldDisableShortcuts } from '~/behaviors/shortcuts/shortcuts_toggle';
+import { getBaseURL, relativePathToAbsolute } from '~/lib/utils/url_utility';
+import { lineState } from '~/blob/state';
+import { getPageParamValue, getPageSearchString } from '~/blob/utils';
+
+Vue.use(GlToast);
+
+export default {
+  components: {
+    GlDisclosureDropdownItem,
+  },
+  props: {
+    permalinkPath: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    permalinkShortcutKey() {
+      return keysFor(PROJECT_FILES_GO_TO_PERMALINK)[0];
+    },
+    shortcutsDisabled() {
+      return shouldDisableShortcuts();
+    },
+    absolutePermalinkPath() {
+      const baseAbsolutePath = relativePathToAbsolute(this.permalinkPath, getBaseURL());
+      if (lineState.currentLineNumber) {
+        const page = getPageParamValue(lineState.currentLineNumber);
+        const searchString = getPageSearchString(baseAbsolutePath, page);
+        return `${baseAbsolutePath}${searchString}#L${lineState.currentLineNumber}`;
+      }
+      return baseAbsolutePath;
+    },
+  },
+  mounted() {
+    Mousetrap.bind(keysFor(PROJECT_FILES_GO_TO_PERMALINK), this.triggerCopyPermalink);
+  },
+  beforeDestroy() {
+    Mousetrap.unbind(keysFor(PROJECT_FILES_GO_TO_PERMALINK));
+  },
+  methods: {
+    triggerCopyPermalink() {
+      const buttonElement = this.$refs.copyPermalinkButton.$el;
+      buttonElement.click();
+      this.onCopyPermalink();
+    },
+    onCopyPermalink() {
+      this.$toast.show(__('Permalink copied to clipboard.'));
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-disclosure-dropdown-item
+    ref="copyPermalinkButton"
+    :aria-keyshortcuts="permalinkShortcutKey"
+    data-testid="permalink"
+    :data-clipboard-text="absolutePermalinkPath"
+    data-clipboard-handle-tooltip="false"
+    @action="onCopyPermalink"
+  >
+    <template #list-item>
+      <span class="gl-flex gl-items-center gl-justify-between">
+        <span>{{ __('Copy permalink') }}</span>
+        <kbd v-if="permalinkShortcutKey && !shortcutsDisabled" class="flat">{{
+          permalinkShortcutKey
+        }}</kbd>
+      </span>
+    </template>
+  </gl-disclosure-dropdown-item>
+</template>
diff --git a/app/assets/javascripts/search/results/components/blob_header.vue b/app/assets/javascripts/search/results/components/blob_header.vue
index 1ad69ae9a11..3698703ea01 100644
--- a/app/assets/javascripts/search/results/components/blob_header.vue
+++ b/app/assets/javascripts/search/results/components/blob_header.vue
@@ -82,6 +82,9 @@ export default {
     codeTheme() {
       return gon?.user_color_scheme || CODE_THEME_DEFAULT;
     },
+    showSecondLine() {
+      return !this.query.project_id && this.projectPath;
+    },
   },
   methods: {
     trackClipboardClick() {
@@ -95,40 +98,46 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-flex gl-items-center gl-leading-1">
-    <file-icon :file-name="filePath" :size="16" aria-hidden="true" css-classes="gl-mr-3" />
+  <div>
+    <div class="gl-flex gl-items-center gl-leading-1">
+      <file-icon :file-name="filePath" :size="16" aria-hidden="true" css-classes="gl-mr-3" />
 
-    <gl-link
-      :href="fileUrl"
-      :title="$options.i18n.fileLink"
-      :class="codeTheme"
-      @click="trackHeaderClick"
-    >
-      <template v-if="projectPath">
-        <strong class="project-path-content" data-testid="project-path-content"
-          >{{ projectPath }}:
-        </strong>
-      </template>
-
-      <strong
-        v-safe-html="highlightedFilePath"
-        class="file-name-content"
-        data-testid="file-name-content"
-      ></strong>
-    </gl-link>
-    <clipboard-button
-      :text="filePath"
-      :gfm="gfmCopyText"
-      :title="__('Copy file path')"
-      category="tertiary"
-      css-class="gl-mr-2"
-      @click="trackClipboardClick"
-    />
-    <gl-label
-      v-if="isHeaderOnly"
-      :background-color="$options.DEFAULT_HEADER_LABEL_COLOR"
-      :title="$options.i18n.isHeaderOnly"
-      class="gl-self-center"
-    />
+      <gl-link
+        :href="fileUrl"
+        :title="$options.i18n.fileLink"
+        class="gl-font-bold !gl-text-link"
+        :class="codeTheme"
+        @click="trackHeaderClick"
+      >
+        <strong
+          v-safe-html="highlightedFilePath"
+          class="file-name-content"
+          data-testid="file-name-content"
+        ></strong>
+      </gl-link>
+      <clipboard-button
+        :text="filePath"
+        :gfm="gfmCopyText"
+        :title="__('Copy file path')"
+        size="small"
+        category="tertiary"
+        css-class="gl-mr-2"
+        @click="trackClipboardClick"
+      />
+      <gl-label
+        v-if="isHeaderOnly"
+        :background-color="$options.DEFAULT_HEADER_LABEL_COLOR"
+        :title="$options.i18n.isHeaderOnly"
+        class="gl-self-center"
+      />
+    </div>
+    <div v-if="showSecondLine">
+      <gl-link
+        :href="projectPath"
+        class="gl-text-sm !gl-text-subtle"
+        data-testid="project-path-content"
+        >{{ projectPath }}
+      </gl-link>
+    </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/todos/components/todos_filter_bar.vue b/app/assets/javascripts/todos/components/todos_filter_bar.vue
index 9cf9dba4545..bdbcbe9ea47 100644
--- a/app/assets/javascripts/todos/components/todos_filter_bar.vue
+++ b/app/assets/javascripts/todos/components/todos_filter_bar.vue
@@ -63,7 +63,7 @@ export const TARGET_TYPES = [
     // eslint-disable-next-line @gitlab/require-i18n-strings
     id: 'Issue',
     value: TODO_TARGET_TYPE_ISSUE,
-    title: s__('Todos|Issue or Epic'),
+    title: s__('Todos|Issue'),
   },
   {
     id: 'MergeRequest',
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
index 97d21ce7371..416586304a1 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
@@ -79,11 +79,11 @@ export const TOKEN_TITLE_MY_REACTION = __('My reaction');
 export const TOKEN_TITLE_ORGANIZATION = s__('Crm|Organization');
 export const TOKEN_TITLE_RELEASE = __('Release');
 export const TOKEN_TITLE_REVIEWER = s__('SearchToken|Reviewer');
-export const TOKEN_TITLE_SOURCE_BRANCH = __('Source Branch');
+export const TOKEN_TITLE_SOURCE_BRANCH = __('Source branch');
 export const TOKEN_TITLE_STATUS = __('Status');
 export const TOKEN_TITLE_JOBS_RUNNER_TYPE = s__('Job|Runner type');
 export const TOKEN_TITLE_JOBS_SOURCE = s__('Job|Source');
-export const TOKEN_TITLE_TARGET_BRANCH = __('Target Branch');
+export const TOKEN_TITLE_TARGET_BRANCH = __('Target branch');
 export const TOKEN_TITLE_TYPE = __('Type');
 export const TOKEN_TITLE_UPDATED = __('Updated');
 export const TOKEN_TITLE_VERSION = __('Version');
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
index c34c48fa975..17545aa8a9c 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@@ -23,8 +23,8 @@ import {
   STATE_OPEN,
   STATE_CLOSED,
   LINKED_CATEGORIES_MAP,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_ISSUE,
   WORK_ITEM_TYPE_ENUM_INCIDENT,
   WORK_ITEM_TYPE_ENUM_ISSUE,
 } from '~/work_items/constants';
@@ -122,14 +122,14 @@ export default {
     },
     isIncident() {
       return (
-        this.issuable.workItemType?.name === WORK_ITEM_TYPE_VALUE_INCIDENT ||
+        this.issuable.workItemType?.name === WORK_ITEM_TYPE_NAME_INCIDENT ||
         this.issuable?.type === WORK_ITEM_TYPE_ENUM_INCIDENT
       );
     },
     isServiceDeskIssue() {
       return (
         (this.issuable?.type === WORK_ITEM_TYPE_ENUM_ISSUE ||
-          this.issuable.workItemType?.name === WORK_ITEM_TYPE_VALUE_ISSUE) &&
+          this.issuable.workItemType?.name === WORK_ITEM_TYPE_NAME_ISSUE) &&
         this.issuable?.author?.username === SUPPORT_BOT_USERNAME
       );
     },
diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue
index 281baf811ef..d7dcb73c80b 100644
--- a/app/assets/javascripts/work_items/components/create_work_item.vue
+++ b/app/assets/javascripts/work_items/components/create_work_item.vue
@@ -54,8 +54,8 @@ import {
   WORK_ITEM_TYPE_NAME_LOWERCASE_MAP,
   WORK_ITEM_TYPE_NAME_MAP,
   WORK_ITEM_TYPE_VALUE_MAP,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_EPIC,
 } from '../constants';
 import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql';
 import namespaceWorkItemTypesQuery from '../graphql/namespace_work_item_types.query.graphql';
@@ -342,7 +342,7 @@ export default {
       // detail view instead. Since the legacy view doesn't support setting a parent
       // we need to hide this attribute here until the migration has been finished.
       // https://gitlab.com/gitlab-org/gitlab/-/issues/502823
-      if (this.selectedWorkItemTypeName === WORK_ITEM_TYPE_VALUE_INCIDENT) {
+      if (this.selectedWorkItemTypeName === WORK_ITEM_TYPE_NAME_INCIDENT) {
         return false;
       }
 
@@ -504,7 +504,7 @@ export default {
       );
     },
     shouldDatesRollup() {
-      return this.selectedWorkItemTypeName === WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.selectedWorkItemTypeName === WORK_ITEM_TYPE_NAME_EPIC;
     },
   },
   watch: {
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
index cf1c1c707c2..8e2f30999de 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
@@ -5,7 +5,7 @@ import { s__, __ } from '~/locale';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import {
   STATE_OPEN,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_TASK,
   WIDGET_TYPE_EMAIL_PARTICIPANTS,
   i18n,
 } from '~/work_items/constants';
@@ -206,7 +206,7 @@ export default {
       return this.isNoteInternal ? this.$options.i18n.addInternalNote : this.commentButtonText;
     },
     docsLinks() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_TASK
+      return this.workItemType === WORK_ITEM_TYPE_NAME_TASK
         ? {
             confidential_issues_docs_path: DOCS_WORK_ITEM_CONFIDENTIAL_TASKS_PATH,
             locked_discussion_docs_path: DOCS_WORK_ITEM_LOCKED_TASKS_PATH,
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
index f972e8da506..c348f348c80 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue
@@ -3,7 +3,7 @@ import { GlLink, GlIcon } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { issuableTypeText } from '~/issues/constants';
-import { WORK_ITEM_TYPE_VALUE_TASK } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_NAME_TASK } from '~/work_items/constants';
 
 export default {
   components: {
@@ -14,7 +14,7 @@ export default {
     workItemType: {
       required: false,
       type: String,
-      default: WORK_ITEM_TYPE_VALUE_TASK,
+      default: WORK_ITEM_TYPE_NAME_TASK,
     },
     isProjectArchived: {
       required: false,
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_relationship_popover.vue b/app/assets/javascripts/work_items/components/shared/work_item_relationship_popover.vue
index 574b6e9b88a..c5499853c9d 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_relationship_popover.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_relationship_popover.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlPopover, GlLoadingIcon, GlTooltipDirective, GlLink } from '@gitlab/ui';
 import { n__ } from '~/locale';
-import { WORK_ITEM_TYPE_VALUE_ISSUE, STATE_CLOSED } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_NAME_ISSUE, STATE_CLOSED } from '~/work_items/constants';
 import WorkItemRelationshipPopoverMetadata from 'ee_else_ce/work_items/components/shared/work_item_relationship_popover_metadata.vue';
 import WorkItemTypeIcon from '../work_item_type_icon.vue';
 
@@ -71,7 +71,7 @@ export default {
         .slice(0, defaultDisplayLimit);
     },
     moreItemsLink() {
-      return `${this.workItemWebUrl}#${this.workItemType === WORK_ITEM_TYPE_VALUE_ISSUE ? 'related-issues' : 'linkeditems'}`;
+      return `${this.workItemWebUrl}#${this.workItemType === WORK_ITEM_TYPE_NAME_ISSUE ? 'related-issues' : 'linkeditems'}`;
     },
   },
 };
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue
index 1045ae3be63..c0c2837c769 100644
--- a/app/assets/javascripts/work_items/components/work_item_actions.vue
+++ b/app/assets/javascripts/work_items/components/work_item_actions.vue
@@ -26,12 +26,12 @@ import WorkItemChangeTypeModal from 'ee_else_ce/work_items/components/work_item_
 import {
   sprintfWorkItem,
   BASE_ALLOWED_CREATE_TYPES,
-  WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_KEY_RESULT,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
   WORK_ITEM_TYPE_ENUM_EPIC,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   WORK_ITEM_TYPE_VALUE_MAP,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_ISSUE,
 } from '../constants';
 import updateWorkItemMutation from '../graphql/update_work_item.mutation.graphql';
 import updateWorkItemNotificationsMutation from '../graphql/update_work_item_notifications.mutation.graphql';
@@ -256,7 +256,7 @@ export default {
         return data.workspace?.workItemTypes?.nodes;
       },
       skip() {
-        return !this.canUpdateMetadata || this.workItemType !== WORK_ITEM_TYPE_VALUE_KEY_RESULT;
+        return !this.canUpdateMetadata || this.workItemType !== WORK_ITEM_TYPE_NAME_KEY_RESULT;
       },
     },
   },
@@ -289,7 +289,7 @@ export default {
       };
     },
     newRelatedItemLabel() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC
         ? sprintfWorkItem(s__('WorkItem|New related %{workItemType}'), this.workItemType)
         : s__('WorkItem|New related item');
     },
@@ -304,7 +304,7 @@ export default {
       return sprintfWorkItem(message, this.workItemType);
     },
     canPromoteToObjective() {
-      return this.canUpdateMetadata && this.workItemType === WORK_ITEM_TYPE_VALUE_KEY_RESULT;
+      return this.canUpdateMetadata && this.workItemType === WORK_ITEM_TYPE_NAME_KEY_RESULT;
     },
     confidentialItem() {
       return {
@@ -323,7 +323,7 @@ export default {
       return this.isDiscussionLocked ? __('Unlock discussion') : __('Lock discussion');
     },
     objectiveWorkItemTypeId() {
-      return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_VALUE_OBJECTIVE).id;
+      return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_NAME_OBJECTIVE).id;
     },
     showDropdownTooltip() {
       return !this.isDropdownVisible ? this.$options.i18n.moreActions : '';
@@ -344,7 +344,7 @@ export default {
       };
     },
     isEpic() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC;
     },
     confidentialityToggledText() {
       return this.isConfidential
@@ -361,8 +361,8 @@ export default {
 
       if (this.glFeatures.okrsMvc && this.hasOkrsFeature) {
         return BASE_ALLOWED_CREATE_TYPES.concat(
-          WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-          WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+          WORK_ITEM_TYPE_NAME_KEY_RESULT,
+          WORK_ITEM_TYPE_NAME_OBJECTIVE,
         );
       }
 
@@ -372,7 +372,7 @@ export default {
       return WORK_ITEM_TYPE_VALUE_MAP[this.workItemType];
     },
     showMoveButton() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_ISSUE && this.canMove;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_ISSUE && this.canMove;
     },
     toggleSidebarLabel() {
       return this.showSidebar ? s__('WorkItem|Hide sidebar') : s__('WorkItem|Show sidebar');
diff --git a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
index 33c254b452a..9ce284869bd 100644
--- a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue
@@ -20,7 +20,7 @@ import {
   WIDGET_TYPE_WEIGHT,
   WIDGET_TYPE_COLOR,
   WIDGET_TYPE_CRM_CONTACTS,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   WORK_ITEM_TYPE_VALUE_MAP,
   WIDGET_TYPE_CUSTOM_FIELDS,
 } from '../constants';
@@ -145,7 +145,7 @@ export default {
       return this.isWidgetPresent(WIDGET_TYPE_START_AND_DUE_DATE);
     },
     canWorkItemRollUp() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC;
     },
     workItemWeight() {
       return this.isWidgetPresent(WIDGET_TYPE_WEIGHT);
@@ -166,10 +166,10 @@ export default {
       return this.isWidgetPresent(WIDGET_TYPE_MILESTONE);
     },
     showRolledupDates() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC;
     },
     isParentEnabled() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC ? this.hasSubepicsFeature : true;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC ? this.hasSubepicsFeature : true;
     },
     workItemParent() {
       return this.isWidgetPresent(WIDGET_TYPE_HIERARCHY)?.parent;
diff --git a/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue b/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
index 14e8547f787..c9a4394c7a2 100644
--- a/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
+++ b/app/assets/javascripts/work_items/components/work_item_change_type_modal.vue
@@ -11,7 +11,7 @@ import {
   WIDGET_TYPE_HIERARCHY,
   ALLOWED_CONVERSION_TYPES,
   WORK_ITEM_TYPE_ENUM_EPIC,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   sprintfWorkItem,
   WORK_ITEM_WIDGETS_NAME_MAP,
   WIDGET_TYPE_DESIGNS,
@@ -362,7 +362,7 @@ export default {
             'WorkItem|Parent item type %{parentWorkItemType} is not supported on %{workItemType}. Remove the parent item to change type.',
           ),
           this.isSelectedWorkItemTypeEpic
-            ? WORK_ITEM_TYPE_VALUE_EPIC
+            ? WORK_ITEM_TYPE_NAME_EPIC
             : this.selectedWorkItemType.text,
           this.parentWorkItemType,
         );
@@ -379,7 +379,7 @@ export default {
           {
             workItemType: capitalizeFirstCharacter(
               this.isSelectedWorkItemTypeEpic
-                ? WORK_ITEM_TYPE_VALUE_EPIC.toLocaleLowerCase()
+                ? WORK_ITEM_TYPE_NAME_EPIC.toLocaleLowerCase()
                 : this.selectedWorkItemType.text.toLocaleLowerCase(),
             ),
             childItemType: this.allowedChildTypes?.[0]?.name?.toLocaleLowerCase(),
@@ -406,7 +406,7 @@ export default {
             'WorkItem|Some fields are not present in %{workItemType}. If you change type now, this information will be lost.',
           ),
           this.isSelectedWorkItemTypeEpic
-            ? WORK_ITEM_TYPE_VALUE_EPIC
+            ? WORK_ITEM_TYPE_NAME_EPIC
             : this.selectedWorkItemType.text,
         );
       }
diff --git a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
index 9a59182ff4d..d84c074c139 100644
--- a/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
+++ b/app/assets/javascripts/work_items/components/work_item_description_rendered.vue
@@ -20,7 +20,7 @@ import SafeHtml from '~/vue_shared/directives/safe_html';
 import {
   WORK_ITEM_TYPE_ENUM_ISSUE,
   WORK_ITEM_TYPE_ENUM_TASK,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
 } from '../constants';
 
 const trackingMixin = InternalEvents.mixin();
@@ -90,7 +90,7 @@ export default {
   },
   computed: {
     childItemType() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC
         ? WORK_ITEM_TYPE_ENUM_ISSUE
         : WORK_ITEM_TYPE_ENUM_TASK;
     },
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index 57418b2429b..4d8ea43a5a8 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -32,19 +32,19 @@ import {
   WIDGET_TYPE_DESCRIPTION,
   WIDGET_TYPE_AWARD_EMOJI,
   WIDGET_TYPE_HIERARCHY,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
   WIDGET_TYPE_NOTES,
   WIDGET_TYPE_LINKED_ITEMS,
   WIDGET_TYPE_DESIGNS,
   WORK_ITEM_REFERENCE_CHAR,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   WIDGET_TYPE_WEIGHT,
   WIDGET_TYPE_DEVELOPMENT,
   STATE_OPEN,
   WIDGET_TYPE_ERROR_TRACKING,
   WIDGET_TYPE_ITERATION,
   WIDGET_TYPE_MILESTONE,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
 } from '../constants';
 
 import workItemUpdatedSubscription from '../graphql/work_item_updated.subscription.graphql';
@@ -363,7 +363,7 @@ export default {
     hasParent() {
       const { workItemType, parentWorkItem, hasSubepicsFeature } = this;
 
-      if (workItemType === WORK_ITEM_TYPE_VALUE_EPIC) {
+      if (workItemType === WORK_ITEM_TYPE_NAME_EPIC) {
         return Boolean(hasSubepicsFeature && parentWorkItem);
       }
 
@@ -449,7 +449,7 @@ export default {
       return !this.isModal && !this.editMode && !this.isDrawer;
     },
     workItemLinkedItems() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC
         ? this.findWidget(WIDGET_TYPE_LINKED_ITEMS) && this.hasLinkedItemsEpicsFeature
         : this.findWidget(WIDGET_TYPE_LINKED_ITEMS);
     },
@@ -629,7 +629,7 @@ export default {
     openContextualView({ event, modalWorkItem }) {
       if (
         !this.contextualViewEnabled ||
-        modalWorkItem.workItemType?.name === WORK_ITEM_TYPE_VALUE_INCIDENT ||
+        modalWorkItem.workItemType?.name === WORK_ITEM_TYPE_NAME_INCIDENT ||
         this.isDrawer
       ) {
         return;
@@ -854,7 +854,7 @@ export default {
       });
     },
   },
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
   WORKSPACE_PROJECT,
   noAccessSvg,
 };
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_actions_split_button.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_actions_split_button.vue
index dcc5cc3eaa0..61945383c6f 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_actions_split_button.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_actions_split_button.vue
@@ -4,8 +4,8 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import { s__ } from '~/locale';
 import HelpIcon from '~/vue_shared/components/help_icon/help_icon.vue';
 import {
-  WORK_ITEM_TYPE_VALUE_EPIC,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_EPIC,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
   sprintfWorkItem,
 } from '../../constants';
 
@@ -51,11 +51,11 @@ export default {
     },
     getPopoverLink(workItemType) {
       switch (workItemType) {
-        case WORK_ITEM_TYPE_VALUE_EPIC:
+        case WORK_ITEM_TYPE_NAME_EPIC:
           return helpPagePath('/user/group/epics/manage_epics', {
             anchor: 'multi-level-child-epics',
           });
-        case WORK_ITEM_TYPE_VALUE_OBJECTIVE:
+        case WORK_ITEM_TYPE_NAME_OBJECTIVE:
           return helpPagePath('/user/okrs', { anchor: 'child-objectives-and-key-results' });
         default:
           return '';
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
index 05f38b30a83..a139ebe5cc6 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue
@@ -11,7 +11,7 @@ import { s__ } from '~/locale';
 import { defaultSortableOptions, DRAG_DELAY } from '~/sortable/constants';
 import { sortableStart, sortableEnd } from '~/sortable/utils';
 
-import { WORK_ITEM_TYPE_VALUE_OBJECTIVE, WORK_ITEM_TYPE_VALUE_EPIC } from '../../constants';
+import { WORK_ITEM_TYPE_NAME_OBJECTIVE, WORK_ITEM_TYPE_NAME_EPIC } from '../../constants';
 import { findHierarchyWidgetChildren, getItems, findHierarchyWidgets } from '../../utils';
 import {
   addHierarchyChild,
@@ -233,7 +233,7 @@ export default {
       });
     },
     prefetchWorkItem({ iid }) {
-      if (this.workItemType !== WORK_ITEM_TYPE_VALUE_OBJECTIVE) {
+      if (this.workItemType !== WORK_ITEM_TYPE_NAME_OBJECTIVE) {
         this.prefetch = setTimeout(
           () => this.addWorkItemQuery({ iid }),
           DEFAULT_DEBOUNCE_AND_THROTTLE_MS,
@@ -499,9 +499,7 @@ export default {
 
       // Check if current item is an Epic
       if (
-        [WORK_ITEM_TYPE_VALUE_EPIC, WORK_ITEM_TYPE_VALUE_OBJECTIVE].includes(
-          item?.workItemType.name,
-        )
+        [WORK_ITEM_TYPE_NAME_EPIC, WORK_ITEM_TYPE_NAME_OBJECTIVE].includes(item?.workItemType.name)
       ) {
         const { top, left } = originalEvent.target.getBoundingClientRect();
 
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
index b6e083289a1..dafc0cd1351 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
@@ -2,7 +2,7 @@
 import { GlButton, GlTooltipDirective } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import { createAlert } from '~/alert';
-import { STATE_OPEN, WORK_ITEM_TYPE_VALUE_TASK } from '../../constants';
+import { STATE_OPEN, WORK_ITEM_TYPE_NAME_TASK } from '../../constants';
 import { findHierarchyWidgets, getDefaultHierarchyChildrenCount, getItems } from '../../utils';
 import toggleHierarchyTreeChildMutation from '../../graphql/client/toggle_hierarchy_tree_child.mutation.graphql';
 import isExpandedHierarchyTreeChildQuery from '../../graphql/client/is_expanded_hierarchy_tree_child.query.graphql';
@@ -190,7 +190,7 @@ export default {
       return this.childItem.workItemType.name;
     },
     iconClass() {
-      if (this.childItemType === WORK_ITEM_TYPE_VALUE_TASK) {
+      if (this.childItemType === WORK_ITEM_TYPE_NAME_TASK) {
         return this.isItemOpen ? 'gl-fill-icon-success' : 'gl-fill-icon-info';
       }
       return '';
@@ -214,7 +214,7 @@ export default {
       };
     },
     shouldShowWeight() {
-      return this.childItemType === WORK_ITEM_TYPE_VALUE_TASK ? this.showTaskWeight : true;
+      return this.childItemType === WORK_ITEM_TYPE_NAME_TASK ? this.showTaskWeight : true;
     },
     allowedChildTypes() {
       return this.allowedChildrenByType?.[this.childItemType] || [];
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
index 4d723de205a..aabbc52944f 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
@@ -12,7 +12,7 @@ import {
   FORM_TYPES,
   WORK_ITEMS_TYPE_MAP,
   WORK_ITEM_TYPE_ENUM_TASK,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   MAX_WORK_ITEMS,
   sprintfWorkItem,
   WIDGET_TYPE_MILESTONE,
@@ -126,7 +126,7 @@ export default {
   },
   computed: {
     workItemChildIsEpic() {
-      return this.childrenTypeValue === WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.childrenTypeValue === WORK_ITEM_TYPE_NAME_EPIC;
     },
     workItemInput() {
       let workItemInput = {
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_rolled_up_data.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_rolled_up_data.vue
index bec58ec6bce..c76037aeb32 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_rolled_up_data.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_rolled_up_data.vue
@@ -6,7 +6,7 @@ import { findWidget } from '~/issues/list/utils';
 import {
   i18n,
   WIDGET_TYPE_WEIGHT,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   WIDGET_TYPE_HEALTH_STATUS,
 } from '../../constants';
 
@@ -96,7 +96,7 @@ export default {
       return Math.round((this.rolledUpCompletedWeight / this.rolledUpWeight) * 100);
     },
     weightTooltip() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC ? __('Issue weight') : __('Weight');
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC ? __('Issue weight') : __('Weight');
     },
     rolledUpHealthStatus() {
       return this.workItemHealthStatus?.rolledUpHealthStatus;
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
index a32b5da47f1..a974b2a421b 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue
@@ -16,7 +16,7 @@ import {
   CHILD_ITEMS_ANCHOR,
   WORKITEM_TREE_SHOWLABELS_LOCALSTORAGEKEY,
   WORKITEM_TREE_SHOWCLOSED_LOCALSTORAGEKEY,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
   WIDGET_TYPE_HIERARCHY,
   INJECTION_LINK_CHILD_PREVENT_ROUTER_NAVIGATION,
   DETAIL_VIEW_QUERY_PARAM_NAME,
@@ -266,7 +266,7 @@ export default {
       return this.showRolledUpWeight && this.rolledUpWeight !== null;
     },
     showTaskWeight() {
-      return this.workItemType !== WORK_ITEM_TYPE_VALUE_EPIC;
+      return this.workItemType !== WORK_ITEM_TYPE_NAME_EPIC;
     },
     allowedChildrenByType() {
       return this.workItemTypes.reduce((acc, type) => {
diff --git a/app/assets/javascripts/work_items/components/work_item_parent.vue b/app/assets/javascripts/work_items/components/work_item_parent.vue
index ca9ed8c2932..fb5f78c0c34 100644
--- a/app/assets/javascripts/work_items/components/work_item_parent.vue
+++ b/app/assets/javascripts/work_items/components/work_item_parent.vue
@@ -17,7 +17,7 @@ import {
   I18N_WORK_ITEM_ERROR_UPDATING,
   sprintfWorkItem,
   WORK_ITEM_TYPE_ENUM_EPIC,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_ISSUE,
   WORK_ITEM_TYPE_VALUE_MAP,
 } from '../constants';
 import { isReference, findHierarchyWidgetDefinition, newWorkItemId } from '../utils';
@@ -93,7 +93,7 @@ export default {
   },
   computed: {
     isIssue() {
-      return this.workItemType === WORK_ITEM_TYPE_VALUE_ISSUE;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_ISSUE;
     },
     isLoading() {
       return (
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
index 49d4d18f48c..3b1c7b434d7 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
@@ -13,7 +13,7 @@ import WorkItemLinkChildContents from '../shared/work_item_link_child_contents.v
 import removeLinkedItemsMutation from '../../graphql/remove_linked_items.mutation.graphql';
 import addLinkedItemsMutation from '../../graphql/add_linked_items.mutation.graphql';
 
-import { RELATIONSHIP_TYPE_ENUM, WORK_ITEM_TYPE_VALUE_INCIDENT } from '../../constants';
+import { RELATIONSHIP_TYPE_ENUM, WORK_ITEM_TYPE_NAME_INCIDENT } from '../../constants';
 
 export default {
   RELATIONSHIP_TYPE_ENUM,
@@ -189,7 +189,7 @@ export default {
     },
     handleLinkedItemClick(event, linkedItem) {
       // if the linkedItem is incident, redirect to the incident page
-      if (linkedItem?.workItem?.workItemType?.name === WORK_ITEM_TYPE_VALUE_INCIDENT) {
+      if (linkedItem?.workItem?.workItemType?.name === WORK_ITEM_TYPE_NAME_INCIDENT) {
         visitUrl(linkedItem.workItem.webUrl);
       } else {
         this.$emit('showModal', { event, child: linkedItem.workItem });
diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js
index 4d179aeab4d..4dc95fedc3a 100644
--- a/app/assets/javascripts/work_items/constants.js
+++ b/app/assets/javascripts/work_items/constants.js
@@ -44,15 +44,15 @@ export const WORK_ITEM_TYPE_ENUM_TASK = 'TASK';
 export const WORK_ITEM_TYPE_ENUM_TEST_CASE = 'TEST_CASE';
 export const WORK_ITEM_TYPE_ENUM_TICKET = 'TICKET';
 
-export const WORK_ITEM_TYPE_VALUE_EPIC = 'Epic';
-export const WORK_ITEM_TYPE_VALUE_INCIDENT = 'Incident';
-export const WORK_ITEM_TYPE_VALUE_ISSUE = 'Issue';
-export const WORK_ITEM_TYPE_VALUE_KEY_RESULT = 'Key Result';
-export const WORK_ITEM_TYPE_VALUE_OBJECTIVE = 'Objective';
-export const WORK_ITEM_TYPE_VALUE_REQUIREMENTS = 'Requirement';
-export const WORK_ITEM_TYPE_VALUE_TASK = 'Task';
-export const WORK_ITEM_TYPE_VALUE_TEST_CASE = 'Test Case';
-export const WORK_ITEM_TYPE_VALUE_TICKET = 'Ticket';
+export const WORK_ITEM_TYPE_NAME_EPIC = 'Epic';
+export const WORK_ITEM_TYPE_NAME_INCIDENT = 'Incident';
+export const WORK_ITEM_TYPE_NAME_ISSUE = 'Issue';
+export const WORK_ITEM_TYPE_NAME_KEY_RESULT = 'Key Result';
+export const WORK_ITEM_TYPE_NAME_OBJECTIVE = 'Objective';
+export const WORK_ITEM_TYPE_NAME_REQUIREMENTS = 'Requirement';
+export const WORK_ITEM_TYPE_NAME_TASK = 'Task';
+export const WORK_ITEM_TYPE_NAME_TEST_CASE = 'Test Case';
+export const WORK_ITEM_TYPE_NAME_TICKET = 'Ticket';
 
 export const SEARCH_DEBOUNCE = 500;
 
@@ -92,57 +92,57 @@ export const WORK_ITEMS_TYPE_MAP = {
   [WORK_ITEM_TYPE_ENUM_INCIDENT]: {
     icon: `issue-type-incident`,
     name: s__('WorkItem|Incident'),
-    value: WORK_ITEM_TYPE_VALUE_INCIDENT,
+    value: WORK_ITEM_TYPE_NAME_INCIDENT,
   },
   [WORK_ITEM_TYPE_ENUM_ISSUE]: {
     icon: `issue-type-issue`,
     name: s__('WorkItem|Issue'),
-    value: WORK_ITEM_TYPE_VALUE_ISSUE,
+    value: WORK_ITEM_TYPE_NAME_ISSUE,
     routeParamName: 'issues',
   },
   [WORK_ITEM_TYPE_ENUM_TASK]: {
     icon: `issue-type-task`,
     name: s__('WorkItem|Task'),
-    value: WORK_ITEM_TYPE_VALUE_TASK,
+    value: WORK_ITEM_TYPE_NAME_TASK,
   },
   [WORK_ITEM_TYPE_ENUM_TEST_CASE]: {
     icon: `issue-type-test-case`,
     name: s__('WorkItem|Test case'),
-    value: WORK_ITEM_TYPE_VALUE_TEST_CASE,
+    value: WORK_ITEM_TYPE_NAME_TEST_CASE,
   },
   [WORK_ITEM_TYPE_ENUM_REQUIREMENTS]: {
     icon: `issue-type-requirements`,
     name: s__('WorkItem|Requirements'),
-    value: WORK_ITEM_TYPE_VALUE_REQUIREMENTS,
+    value: WORK_ITEM_TYPE_NAME_REQUIREMENTS,
   },
   [WORK_ITEM_TYPE_ENUM_OBJECTIVE]: {
     icon: `issue-type-objective`,
     name: s__('WorkItem|Objective'),
-    value: WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+    value: WORK_ITEM_TYPE_NAME_OBJECTIVE,
   },
   [WORK_ITEM_TYPE_ENUM_KEY_RESULT]: {
     icon: `issue-type-keyresult`,
     name: s__('WorkItem|Key result'),
-    value: WORK_ITEM_TYPE_VALUE_KEY_RESULT,
+    value: WORK_ITEM_TYPE_NAME_KEY_RESULT,
   },
   [WORK_ITEM_TYPE_ENUM_EPIC]: {
     icon: `epic`,
     name: s__('WorkItem|Epic'),
-    value: WORK_ITEM_TYPE_VALUE_EPIC,
+    value: WORK_ITEM_TYPE_NAME_EPIC,
     routeParamName: 'epics',
   },
 };
 
 export const WORK_ITEM_TYPE_VALUE_MAP = {
-  [WORK_ITEM_TYPE_VALUE_EPIC]: WORK_ITEM_TYPE_ENUM_EPIC,
-  [WORK_ITEM_TYPE_VALUE_INCIDENT]: WORK_ITEM_TYPE_ENUM_INCIDENT,
-  [WORK_ITEM_TYPE_VALUE_ISSUE]: WORK_ITEM_TYPE_ENUM_ISSUE,
-  [WORK_ITEM_TYPE_VALUE_KEY_RESULT]: WORK_ITEM_TYPE_ENUM_KEY_RESULT,
-  [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: WORK_ITEM_TYPE_ENUM_OBJECTIVE,
-  [WORK_ITEM_TYPE_VALUE_REQUIREMENTS]: WORK_ITEM_TYPE_ENUM_REQUIREMENTS,
-  [WORK_ITEM_TYPE_VALUE_TASK]: WORK_ITEM_TYPE_ENUM_TASK,
-  [WORK_ITEM_TYPE_VALUE_TEST_CASE]: WORK_ITEM_TYPE_ENUM_TEST_CASE,
-  [WORK_ITEM_TYPE_VALUE_TICKET]: WORK_ITEM_TYPE_ENUM_TICKET,
+  [WORK_ITEM_TYPE_NAME_EPIC]: WORK_ITEM_TYPE_ENUM_EPIC,
+  [WORK_ITEM_TYPE_NAME_INCIDENT]: WORK_ITEM_TYPE_ENUM_INCIDENT,
+  [WORK_ITEM_TYPE_NAME_ISSUE]: WORK_ITEM_TYPE_ENUM_ISSUE,
+  [WORK_ITEM_TYPE_NAME_KEY_RESULT]: WORK_ITEM_TYPE_ENUM_KEY_RESULT,
+  [WORK_ITEM_TYPE_NAME_OBJECTIVE]: WORK_ITEM_TYPE_ENUM_OBJECTIVE,
+  [WORK_ITEM_TYPE_NAME_REQUIREMENTS]: WORK_ITEM_TYPE_ENUM_REQUIREMENTS,
+  [WORK_ITEM_TYPE_NAME_TASK]: WORK_ITEM_TYPE_ENUM_TASK,
+  [WORK_ITEM_TYPE_NAME_TEST_CASE]: WORK_ITEM_TYPE_ENUM_TEST_CASE,
+  [WORK_ITEM_TYPE_NAME_TICKET]: WORK_ITEM_TYPE_ENUM_TICKET,
 };
 
 export const FORM_TYPES = {
@@ -223,9 +223,9 @@ export const LINKED_ITEM_TYPE_VALUE = {
 };
 
 export const LINK_ITEM_FORM_HEADER_LABEL = {
-  [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: s__('WorkItem|The current objective'),
-  [WORK_ITEM_TYPE_VALUE_KEY_RESULT]: s__('WorkItem|The current key result'),
-  [WORK_ITEM_TYPE_VALUE_TASK]: s__('WorkItem|The current task'),
+  [WORK_ITEM_TYPE_NAME_OBJECTIVE]: s__('WorkItem|The current objective'),
+  [WORK_ITEM_TYPE_NAME_KEY_RESULT]: s__('WorkItem|The current key result'),
+  [WORK_ITEM_TYPE_NAME_TASK]: s__('WorkItem|The current task'),
 };
 
 export const LINKED_ITEMS_ANCHOR = 'linkeditems';
@@ -301,40 +301,40 @@ export const WORK_ITEM_CREATE_ENTITY_MODAL_TARGET_SOURCE = 'source';
 export const WORK_ITEM_CREATE_ENTITY_MODAL_TARGET_BRANCH = 'branch';
 
 export const BASE_ALLOWED_CREATE_TYPES = [
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_ISSUE,
+  WORK_ITEM_TYPE_NAME_TASK,
 ];
 
 export const ALLOWED_CONVERSION_TYPES = [
-  WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_TASK,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_KEY_RESULT,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_TASK,
+  WORK_ITEM_TYPE_NAME_ISSUE,
 ];
 
 export const WORK_ITEM_TYPE_NAME_MAP = {
-  [WORK_ITEM_TYPE_VALUE_EPIC]: s__('WorkItem|Epic'),
-  [WORK_ITEM_TYPE_VALUE_INCIDENT]: s__('WorkItem|Incident'),
-  [WORK_ITEM_TYPE_VALUE_ISSUE]: s__('WorkItem|Issue'),
-  [WORK_ITEM_TYPE_VALUE_KEY_RESULT]: s__('WorkItem|Key result'),
-  [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: s__('WorkItem|Objective'),
-  [WORK_ITEM_TYPE_VALUE_REQUIREMENTS]: s__('WorkItem|Requirement'),
-  [WORK_ITEM_TYPE_VALUE_TASK]: s__('WorkItem|Task'),
-  [WORK_ITEM_TYPE_VALUE_TEST_CASE]: s__('WorkItem|Test case'),
-  [WORK_ITEM_TYPE_VALUE_TICKET]: s__('WorkItem|Ticket'),
+  [WORK_ITEM_TYPE_NAME_EPIC]: s__('WorkItem|Epic'),
+  [WORK_ITEM_TYPE_NAME_INCIDENT]: s__('WorkItem|Incident'),
+  [WORK_ITEM_TYPE_NAME_ISSUE]: s__('WorkItem|Issue'),
+  [WORK_ITEM_TYPE_NAME_KEY_RESULT]: s__('WorkItem|Key result'),
+  [WORK_ITEM_TYPE_NAME_OBJECTIVE]: s__('WorkItem|Objective'),
+  [WORK_ITEM_TYPE_NAME_REQUIREMENTS]: s__('WorkItem|Requirement'),
+  [WORK_ITEM_TYPE_NAME_TASK]: s__('WorkItem|Task'),
+  [WORK_ITEM_TYPE_NAME_TEST_CASE]: s__('WorkItem|Test case'),
+  [WORK_ITEM_TYPE_NAME_TICKET]: s__('WorkItem|Ticket'),
 };
 
 export const WORK_ITEM_TYPE_NAME_LOWERCASE_MAP = {
-  [WORK_ITEM_TYPE_VALUE_EPIC]: s__('WorkItem|epic'),
-  [WORK_ITEM_TYPE_VALUE_INCIDENT]: s__('WorkItem|incident'),
-  [WORK_ITEM_TYPE_VALUE_ISSUE]: s__('WorkItem|issue'),
-  [WORK_ITEM_TYPE_VALUE_KEY_RESULT]: s__('WorkItem|key result'),
-  [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: s__('WorkItem|objective'),
-  [WORK_ITEM_TYPE_VALUE_REQUIREMENTS]: s__('WorkItem|requirement'),
-  [WORK_ITEM_TYPE_VALUE_TASK]: s__('WorkItem|task'),
-  [WORK_ITEM_TYPE_VALUE_TEST_CASE]: s__('WorkItem|test case'),
-  [WORK_ITEM_TYPE_VALUE_TICKET]: s__('WorkItem|ticket'),
+  [WORK_ITEM_TYPE_NAME_EPIC]: s__('WorkItem|epic'),
+  [WORK_ITEM_TYPE_NAME_INCIDENT]: s__('WorkItem|incident'),
+  [WORK_ITEM_TYPE_NAME_ISSUE]: s__('WorkItem|issue'),
+  [WORK_ITEM_TYPE_NAME_KEY_RESULT]: s__('WorkItem|key result'),
+  [WORK_ITEM_TYPE_NAME_OBJECTIVE]: s__('WorkItem|objective'),
+  [WORK_ITEM_TYPE_NAME_REQUIREMENTS]: s__('WorkItem|requirement'),
+  [WORK_ITEM_TYPE_NAME_TASK]: s__('WorkItem|task'),
+  [WORK_ITEM_TYPE_NAME_TEST_CASE]: s__('WorkItem|test case'),
+  [WORK_ITEM_TYPE_NAME_TICKET]: s__('WorkItem|ticket'),
 };
 
 export const WORK_ITEM_WIDGETS_NAME_MAP = {
diff --git a/app/graphql/resolvers/ci/runner_owner_project_resolver.rb b/app/graphql/resolvers/ci/runner_owner_project_resolver.rb
index 4b5b62d8b6f..a1d620a4768 100644
--- a/app/graphql/resolvers/ci/runner_owner_project_resolver.rb
+++ b/app/graphql/resolvers/ci/runner_owner_project_resolver.rb
@@ -35,21 +35,30 @@ module Resolvers
         return unless runner.project_type?
 
         BatchLoader::GraphQL.for(runner.id).batch do |runner_ids, loader|
-          # rubocop: disable CodeReuse/ActiveRecord -- this runs on a limited number of records
-          runner_id_to_owner_id =
-            ::Ci::Runner.project_type.id_in(runner_ids)
-              .pluck(:id, :sharding_key_id)
-              .to_h
-          # rubocop: enable CodeReuse/ActiveRecord
+          # rubocop:disable CodeReuse/ActiveRecord -- this query is too specific to generalize in model
+          runner_and_projects_with_row_number =
+            ::Ci::RunnerProject
+              .where(runner_id: runner_ids)
+              .select('id, runner_id, project_id, ROW_NUMBER() OVER (PARTITION BY runner_id ORDER BY id ASC)')
+          runner_and_owner_projects =
+            ::Ci::RunnerProject
+              .select(:id, :runner_id, :project_id)
+              .from("(#{runner_and_projects_with_row_number.to_sql}) temp WHERE row_number = 1")
+          owner_project_id_by_runner_id =
+            runner_and_owner_projects
+              .group_by(&:runner_id)
+              .transform_values { |runner_projects| runner_projects.first.project_id }
+          project_ids = owner_project_id_by_runner_id.values.uniq
 
-          projects = apply_lookahead(Project.id_in(runner_id_to_owner_id.values.uniq))
+          projects = apply_lookahead(Project.id_in(project_ids))
           Preloaders::ProjectPolicyPreloader.new(projects, current_user).execute
           projects_by_id = projects.index_by(&:id)
 
           runner_ids.each do |runner_id|
-            owner_project_id = runner_id_to_owner_id[runner_id]
+            owner_project_id = owner_project_id_by_runner_id[runner_id]
             loader.call(runner_id, projects_by_id[owner_project_id])
           end
+          # rubocop: enable CodeReuse/ActiveRecord
         end
       end
     end
diff --git a/app/models/ci/partition.rb b/app/models/ci/partition.rb
index 1efe5f38b01..72a3a02a8a7 100644
--- a/app/models/ci/partition.rb
+++ b/app/models/ci/partition.rb
@@ -3,6 +3,7 @@
 module Ci
   class Partition < Ci::ApplicationRecord
     MAX_PARTITION_SIZE = 100.gigabytes
+    GSTG_PARTITION_SIZE = 4.gigabytes
 
     INITIAL_PARTITION_VALUE = 100
     LATEST_PARTITION_VALUE = 102
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 04e0979c54a..1d4bb4ef491 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -420,11 +420,11 @@ module Ci
       when 'instance_type'
         ::User.find_by_id(creator_id)
       when 'group_type'
-        ::Group.find_by_id(sharding_key_id)
+        runner_namespaces.first&.namespace
       when 'project_type'
-        owner_project = ::Project.find_by_id(sharding_key_id)
-
-        owner_project || fallback_owner_project
+        # If runner projects are not yet saved (e.g. when calculating `routable_token`), use in-memory collection
+        candidates = persisted? ? runner_projects.order(:id) : runner_projects
+        candidates.first&.project
       end
     end
     strong_memoize_attr :owner
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index ac55950fbda..be76c4412f8 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -317,7 +317,7 @@ class ContainerRepository < ApplicationRecord
 
     return false unless project.has_container_registry_protected_tag_rules?(
       action: 'delete',
-      access_level: user.max_member_access_for_project(project.id)
+      access_level: project.team.max_member_access(user.id)
     )
 
     # This is an API call so we put it last
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index e126502e292..5884557df1d 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -152,7 +152,7 @@ module Auth
       # can return early here, but not any earlier.
       return patterns if user.can_admin_all_resources?
 
-      user_access_level = user.max_member_access_for_project(project.id)
+      user_access_level = project.team.max_member_access(user.id)
       applicable_rules = rules.for_actions_and_access(actions_to_check, user_access_level, include_immutable: false)
 
       applicable_rules.each do |rule|
@@ -386,10 +386,9 @@ module Auth
         next unless push_scope_container_registry_path.valid?
 
         repository_project = push_scope_container_registry_path.repository_project
-        current_user_project_authorization_access_level = current_user&.max_member_access_for_project(repository_project.id)
 
         repository_project.container_registry_protection_rules.for_push_exists?(
-          access_level: current_user_project_authorization_access_level,
+          access_level: repository_project.team.max_member_access(current_user&.id),
           repository_path: push_scope_container_registry_path.to_s
         )
       end
diff --git a/app/services/ci/partitions/create_service.rb b/app/services/ci/partitions/create_service.rb
index eb22a4b05ab..52bfb08c9fe 100644
--- a/app/services/ci/partitions/create_service.rb
+++ b/app/services/ci/partitions/create_service.rb
@@ -25,7 +25,10 @@ module Ci
       end
 
       def above_threshold?
-        partition.above_threshold?(Ci::Partition::MAX_PARTITION_SIZE)
+        threshold = Ci::Partition::MAX_PARTITION_SIZE
+        threshold = Ci::Partition::GSTG_PARTITION_SIZE if Gitlab.staging?
+
+        partition.above_threshold?(threshold)
       end
 
       def headroom_available?
diff --git a/app/services/ci/partitions/sync_service.rb b/app/services/ci/partitions/sync_service.rb
index 5e8d437dccd..c70f9c5d294 100644
--- a/app/services/ci/partitions/sync_service.rb
+++ b/app/services/ci/partitions/sync_service.rb
@@ -24,7 +24,10 @@ module Ci
       attr_reader :partition
 
       def above_threshold?
-        partition.above_threshold?(Ci::Partition::MAX_PARTITION_SIZE)
+        threshold = Ci::Partition::MAX_PARTITION_SIZE
+        threshold = Ci::Partition::GSTG_PARTITION_SIZE if Gitlab.staging?
+
+        partition.above_threshold?(threshold)
       end
 
       def sync_available_partitions_statuses!
diff --git a/app/services/container_registry/protection/check_rule_existence_service.rb b/app/services/container_registry/protection/check_rule_existence_service.rb
index e2065eff912..4f859036af4 100644
--- a/app/services/container_registry/protection/check_rule_existence_service.rb
+++ b/app/services/container_registry/protection/check_rule_existence_service.rb
@@ -40,10 +40,9 @@ module ContainerRegistry
       def check_rule_exists_for_user
         return false if current_user.can_admin_all_resources?
 
-        user_project_authorization_access_level = current_user.max_member_access_for_project(project.id)
         project.container_registry_protection_rules.for_action_exists?(
           action: params[:action],
-          access_level: user_project_authorization_access_level,
+          access_level: project.team.max_member_access(current_user.id),
           repository_path: params[:repository_path]
         )
       end
diff --git a/app/services/packages/protection/check_delete_rule_existence_service.rb b/app/services/packages/protection/check_delete_rule_existence_service.rb
index c7d162c714b..8a61dd0684e 100644
--- a/app/services/packages/protection/check_delete_rule_existence_service.rb
+++ b/app/services/packages/protection/check_delete_rule_existence_service.rb
@@ -15,10 +15,8 @@ module Packages
         return ERROR_RESPONSE_UNAUTHORIZED unless current_user_can_destroy_package?
         return SUCCESS_RESPONSE_RULE_DOESNT_EXIST if current_user.can_admin_all_resources?
 
-        user_project_authorization_access_level = current_user.max_member_access_for_project(project.id)
-
         response = project.package_protection_rules.for_delete_exists?(
-          access_level: user_project_authorization_access_level,
+          access_level: project.team.max_member_access(current_user.id),
           package_name: params[:package_name],
           package_type: params[:package_type]
         )
diff --git a/app/services/packages/protection/check_rule_existence_service.rb b/app/services/packages/protection/check_rule_existence_service.rb
index d97ae998384..72eded26f5f 100644
--- a/app/services/packages/protection/check_rule_existence_service.rb
+++ b/app/services/packages/protection/check_rule_existence_service.rb
@@ -33,10 +33,9 @@ module Packages
       def check_rule_exists_for_user
         return false if current_user.can_admin_all_resources?
 
-        user_project_authorization_access_level = current_user.max_member_access_for_project(project.id)
         project.package_protection_rules.for_action_exists?(
           action: :push,
-          access_level: user_project_authorization_access_level,
+          access_level: project.team.max_member_access(current_user.id),
           package_name: params[:package_name],
           package_type: params[:package_type]
         )
diff --git a/app/services/projects/container_repository/cleanup_tags_base_service.rb b/app/services/projects/container_repository/cleanup_tags_base_service.rb
index 41cfbcc4a67..a46ede1e951 100644
--- a/app/services/projects/container_repository/cleanup_tags_base_service.rb
+++ b/app/services/projects/container_repository/cleanup_tags_base_service.rb
@@ -29,7 +29,7 @@ module Projects
         if current_user
           return if current_user.can_admin_all_resources?
 
-          user_access_level = current_user.max_member_access_for_project(project.id)
+          user_access_level = project.team.max_member_access(current_user.id)
           tag_rules = tag_rules.for_delete_and_access(user_access_level)
         end
 
diff --git a/app/services/projects/container_repository/gitlab/delete_tags_service.rb b/app/services/projects/container_repository/gitlab/delete_tags_service.rb
index 72573e59c68..c53803e2ece 100644
--- a/app/services/projects/container_repository/gitlab/delete_tags_service.rb
+++ b/app/services/projects/container_repository/gitlab/delete_tags_service.rb
@@ -59,7 +59,7 @@ module Projects
           if current_user
             return if current_user.can_admin_all_resources?
 
-            user_access_level = current_user.max_member_access_for_project(project.id)
+            user_access_level = project.team.max_member_access(current_user.id)
             tag_rules = tag_rules.for_delete_and_access(user_access_level)
           end
 
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index ef4fb5cc3ea..2a2940177b1 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -334,7 +334,7 @@ module Projects
 
       return false unless project.has_container_registry_protected_tag_rules?(
         action: 'delete',
-        access_level: current_user.max_member_access_for_project(project.id)
+        access_level: project.team.max_member_access(current_user.id)
       )
 
       return false unless project.has_container_registry_tags?
diff --git a/db/docs/alert_management_alerts.yml b/db/docs/alert_management_alerts.yml
index a54b5bd43fe..51d8a818d0c 100644
--- a/db/docs/alert_management_alerts.yml
+++ b/db/docs/alert_management_alerts.yml
@@ -10,4 +10,4 @@ milestone: '13.0'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/approval_merge_request_rules.yml b/db/docs/approval_merge_request_rules.yml
index f0e82bcca24..b1ef9d21657 100644
--- a/db/docs/approval_merge_request_rules.yml
+++ b/db/docs/approval_merge_request_rules.yml
@@ -8,6 +8,6 @@ description: Keeps approval merge request rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: large
 sharding_key:
   project_id: projects
diff --git a/db/docs/approval_merge_request_rules_approved_approvers.yml b/db/docs/approval_merge_request_rules_approved_approvers.yml
index 6cf9c77de4e..c0ed6da7644 100644
--- a/db/docs/approval_merge_request_rules_approved_approvers.yml
+++ b/db/docs/approval_merge_request_rules_approved_approvers.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: approval_merge_request_rules
         sharding_key: project_id
         belongs_to: approval_merge_request_rule
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillApprovalMergeRequestRulesApprovedApproversProjectId
diff --git a/db/docs/approval_merge_request_rules_users.yml b/db/docs/approval_merge_request_rules_users.yml
index cb7331fdd80..cf309525bee 100644
--- a/db/docs/approval_merge_request_rules_users.yml
+++ b/db/docs/approval_merge_request_rules_users.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: approval_merge_request_rules
         sharding_key: project_id
         belongs_to: approval_merge_request_rule
-table_size: small
+table_size: over_limit
 desired_sharding_key_migration_job_name: BackfillApprovalMergeRequestRulesUsersProjectId
diff --git a/db/docs/approvals.yml b/db/docs/approvals.yml
index 1f9eadff5db..ac97338363f 100644
--- a/db/docs/approvals.yml
+++ b/db/docs/approvals.yml
@@ -10,4 +10,4 @@ milestone: '7.12'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/authentication_events.yml b/db/docs/authentication_events.yml
index 66ab7478fce..72f04b991d5 100644
--- a/db/docs/authentication_events.yml
+++ b/db/docs/authentication_events.yml
@@ -8,4 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39652
 milestone: '13.4'
 gitlab_schema: gitlab_main_clusterwide
-table_size: small
+table_size: large
diff --git a/db/docs/deployment_merge_requests.yml b/db/docs/deployment_merge_requests.yml
index 1e5d853db72..ef9d873daaa 100644
--- a/db/docs/deployment_merge_requests.yml
+++ b/db/docs/deployment_merge_requests.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: deployments
         sharding_key: project_id
         belongs_to: deployment
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillDeploymentMergeRequestsProjectId
diff --git a/db/docs/deployments.yml b/db/docs/deployments.yml
index 5f496051f72..10e804dcd6d 100644
--- a/db/docs/deployments.yml
+++ b/db/docs/deployments.yml
@@ -21,4 +21,4 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_deployments_on_user_id_and_status_and_created_at
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157136
-table_size: small
+table_size: over_limit
diff --git a/db/docs/description_versions.yml b/db/docs/description_versions.yml
index f5ffad48eb6..6af8b7eed70 100644
--- a/db/docs/description_versions.yml
+++ b/db/docs/description_versions.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17147
 milestone: '12.4'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514600
-table_size: small
+table_size: over_limit
diff --git a/db/docs/diff_note_positions.yml b/db/docs/diff_note_positions.yml
index 93fa4ee8579..064ea4679a2 100644
--- a/db/docs/diff_note_positions.yml
+++ b/db/docs/diff_note_positions.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28113
 milestone: '13.0'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444222
-table_size: small
+table_size: medium
diff --git a/db/docs/dora_daily_metrics.yml b/db/docs/dora_daily_metrics.yml
index 596b2b40abc..26878a06f20 100644
--- a/db/docs/dora_daily_metrics.yml
+++ b/db/docs/dora_daily_metrics.yml
@@ -8,6 +8,6 @@ description: Stores daily snapshots of DORA4 metrics per environment.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55473
 milestone: '13.10'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/duo_workflows_checkpoints.yml b/db/docs/duo_workflows_checkpoints.yml
index c487f8452bc..b060989fc2f 100644
--- a/db/docs/duo_workflows_checkpoints.yml
+++ b/db/docs/duo_workflows_checkpoints.yml
@@ -4,10 +4,10 @@ classes:
 - Ai::DuoWorkflows::Checkpoint
 feature_categories:
 - duo_workflow
-description:
-introduced_by_url:
+description: 
+introduced_by_url: 
 milestone: '17.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/environments.yml b/db/docs/environments.yml
index 233a707f6c9..5d259928de0 100644
--- a/db/docs/environments.yml
+++ b/db/docs/environments.yml
@@ -11,4 +11,4 @@ milestone: '8.9'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/events.yml b/db/docs/events.yml
index 83d1456a217..39d5f78cd40 100644
--- a/db/docs/events.yml
+++ b/db/docs/events.yml
@@ -19,4 +19,4 @@ sharding_key:
   project_id: projects
   group_id: namespaces
   personal_namespace_id: namespaces
-table_size: small
+table_size: over_limit
diff --git a/db/docs/gpg_signatures.yml b/db/docs/gpg_signatures.yml
index e528c0b1144..8ce3d082fe3 100644
--- a/db/docs/gpg_signatures.yml
+++ b/db/docs/gpg_signatures.yml
@@ -10,4 +10,4 @@ milestone: '9.5'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/import_source_user_placeholder_references.yml b/db/docs/import_source_user_placeholder_references.yml
index e982423a4ba..03484b775d1 100644
--- a/db/docs/import_source_user_placeholder_references.yml
+++ b/db/docs/import_source_user_placeholder_references.yml
@@ -10,4 +10,4 @@ milestone: '17.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
-table_size: small
+table_size: medium
diff --git a/db/docs/incident_management_timeline_event_tags.yml b/db/docs/incident_management_timeline_event_tags.yml
index fcad6a33c71..2ed4baca01d 100644
--- a/db/docs/incident_management_timeline_event_tags.yml
+++ b/db/docs/incident_management_timeline_event_tags.yml
@@ -10,4 +10,4 @@ milestone: '15.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/issue_metrics.yml b/db/docs/issue_metrics.yml
index 4c3749afe79..3c4767e7106 100644
--- a/db/docs/issue_metrics.yml
+++ b/db/docs/issue_metrics.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillIssueMetricsNamespaceId
diff --git a/db/docs/issue_user_mentions.yml b/db/docs/issue_user_mentions.yml
index d88de5e939b..7bfecb0da24 100644
--- a/db/docs/issue_user_mentions.yml
+++ b/db/docs/issue_user_mentions.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillIssueUserMentionsNamespaceId
diff --git a/db/docs/issues.yml b/db/docs/issues.yml
index 92b1afc4f0a..aaf81ce71e7 100644
--- a/db/docs/issues.yml
+++ b/db/docs/issues.yml
@@ -11,4 +11,4 @@ milestone: "<6.0"
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
-table_size: small
+table_size: over_limit
diff --git a/db/docs/keys.yml b/db/docs/keys.yml
index 20e190bbb72..e479f22318a 100644
--- a/db/docs/keys.yml
+++ b/db/docs/keys.yml
@@ -12,4 +12,4 @@ description: SSH keys used by users or for deployments.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9ba1224867665844b117fa037e1465bb706b3685
 milestone: "<6.0"
 gitlab_schema: gitlab_main_clusterwide
-table_size: small
+table_size: medium
diff --git a/db/docs/label_links.yml b/db/docs/label_links.yml
index 96f332d6724..bfe24283027 100644
--- a/db/docs/label_links.yml
+++ b/db/docs/label_links.yml
@@ -10,4 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/03654a6abf47c88
 milestone: '7.2'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514599
-table_size: small
+table_size: medium
diff --git a/db/docs/lfs_objects.yml b/db/docs/lfs_objects.yml
index 713787fe15a..82f38f3da31 100644
--- a/db/docs/lfs_objects.yml
+++ b/db/docs/lfs_objects.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17
 milestone: '8.2'
 gitlab_schema: gitlab_main_cell_local
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490482
-table_size: small
+table_size: medium
diff --git a/db/docs/lfs_objects_projects.yml b/db/docs/lfs_objects_projects.yml
index 42d531c8235..928e6678556 100644
--- a/db/docs/lfs_objects_projects.yml
+++ b/db/docs/lfs_objects_projects.yml
@@ -10,4 +10,4 @@ milestone: '8.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/members.yml b/db/docs/members.yml
index b102e586dc9..6de71483499 100644
--- a/db/docs/members.yml
+++ b/db/docs/members.yml
@@ -13,4 +13,4 @@ milestone: '7.4'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   member_namespace_id: namespaces
-table_size: small
+table_size: medium
diff --git a/db/docs/merge_request_assignees.yml b/db/docs/merge_request_assignees.yml
index 9bce94a3459..92fce24de79 100644
--- a/db/docs/merge_request_assignees.yml
+++ b/db/docs/merge_request_assignees.yml
@@ -8,6 +8,6 @@ description: Store allocated assignees for merge requests
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/26496
 milestone: '11.10'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/merge_request_cleanup_schedules.yml b/db/docs/merge_request_cleanup_schedules.yml
index 982c0a1b716..d1c2df763e9 100644
--- a/db/docs/merge_request_cleanup_schedules.yml
+++ b/db/docs/merge_request_cleanup_schedules.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: merge_requests
         sharding_key: target_project_id
         belongs_to: merge_request
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillMergeRequestCleanupSchedulesProjectId
diff --git a/db/docs/merge_request_diff_commits.yml b/db/docs/merge_request_diff_commits.yml
index cd5574906ba..fd4fa5e2ea0 100644
--- a/db/docs/merge_request_diff_commits.yml
+++ b/db/docs/merge_request_diff_commits.yml
@@ -17,4 +17,4 @@ desired_sharding_key:
         table: merge_request_diffs
         sharding_key: project_id
         belongs_to: merge_request_diff
-table_size: small
+table_size: over_limit
diff --git a/db/docs/merge_request_diff_files.yml b/db/docs/merge_request_diff_files.yml
index 9c9c54e4540..01a11670686 100644
--- a/db/docs/merge_request_diff_files.yml
+++ b/db/docs/merge_request_diff_files.yml
@@ -17,4 +17,4 @@ desired_sharding_key:
         table: merge_request_diffs
         sharding_key: project_id
         belongs_to: merge_request_diff
-table_size: small
+table_size: over_limit
diff --git a/db/docs/merge_request_diffs.yml b/db/docs/merge_request_diffs.yml
index 8c7b0dbc315..61000bedf47 100644
--- a/db/docs/merge_request_diffs.yml
+++ b/db/docs/merge_request_diffs.yml
@@ -11,4 +11,4 @@ milestone: '6.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/merge_request_metrics.yml b/db/docs/merge_request_metrics.yml
index 69490a90eee..e2e664bb2cc 100644
--- a/db/docs/merge_request_metrics.yml
+++ b/db/docs/merge_request_metrics.yml
@@ -11,4 +11,4 @@ milestone: '8.12'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   target_project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/merge_request_reviewers.yml b/db/docs/merge_request_reviewers.yml
index 4cf437019bd..719d3b268b6 100644
--- a/db/docs/merge_request_reviewers.yml
+++ b/db/docs/merge_request_reviewers.yml
@@ -8,6 +8,6 @@ description: Store allocated reviewers for merge requests
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40358
 milestone: '13.4'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/merge_request_user_mentions.yml b/db/docs/merge_request_user_mentions.yml
index 2d51ba9a872..a8197f6f951 100644
--- a/db/docs/merge_request_user_mentions.yml
+++ b/db/docs/merge_request_user_mentions.yml
@@ -8,6 +8,6 @@ description: Store user mentions for merge requests
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19009
 milestone: '12.6'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/merge_requests.yml b/db/docs/merge_requests.yml
index 8149311ce58..ede26d2c7ba 100644
--- a/db/docs/merge_requests.yml
+++ b/db/docs/merge_requests.yml
@@ -10,4 +10,4 @@ milestone: "<6.0"
 gitlab_schema: gitlab_main_cell
 sharding_key:
   target_project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/merge_requests_compliance_violations.yml b/db/docs/merge_requests_compliance_violations.yml
index 0c5c5fd0d15..5ed31f01412 100644
--- a/db/docs/merge_requests_compliance_violations.yml
+++ b/db/docs/merge_requests_compliance_violations.yml
@@ -8,6 +8,6 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74290
 milestone: '14.6'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   target_project_id: projects
diff --git a/db/docs/namespaces.yml b/db/docs/namespaces.yml
index 60180d6ae44..4c69f7bc9df 100644
--- a/db/docs/namespaces.yml
+++ b/db/docs/namespaces.yml
@@ -20,4 +20,4 @@ schema_inconsistencies:
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135040
 sharding_key:
   organization_id: organizations
-table_size: small
+table_size: large
diff --git a/db/docs/note_diff_files.yml b/db/docs/note_diff_files.yml
index f490ce08c6a..a5467d6703f 100644
--- a/db/docs/note_diff_files.yml
+++ b/db/docs/note_diff_files.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18
 milestone: '11.0'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444222
-table_size: small
+table_size: over_limit
diff --git a/db/docs/notes.yml b/db/docs/notes.yml
index 4be695ed982..e520d952ab0 100644
--- a/db/docs/notes.yml
+++ b/db/docs/notes.yml
@@ -23,4 +23,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9ba122486766584
 milestone: "<6.0"
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444222
-table_size: small
+table_size: over_limit
diff --git a/db/docs/oauth_access_grants.yml b/db/docs/oauth_access_grants.yml
index cb271c149e5..7c0ffcb1474 100644
--- a/db/docs/oauth_access_grants.yml
+++ b/db/docs/oauth_access_grants.yml
@@ -11,4 +11,4 @@ milestone: '7.7'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   organization_id: organizations
-table_size: small
+table_size: medium
diff --git a/db/docs/oauth_access_tokens.yml b/db/docs/oauth_access_tokens.yml
index 1008e5f0f84..44d36872b7f 100644
--- a/db/docs/oauth_access_tokens.yml
+++ b/db/docs/oauth_access_tokens.yml
@@ -11,4 +11,4 @@ milestone: '7.7'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   organization_id: organizations
-table_size: small
+table_size: over_limit
diff --git a/db/docs/packages_dependency_links.yml b/db/docs/packages_dependency_links.yml
index e3ff9fef060..e9ce3d70c66 100644
--- a/db/docs/packages_dependency_links.yml
+++ b/db/docs/packages_dependency_links.yml
@@ -8,6 +8,6 @@ description: Join table between packages_packages and packages_dependencies
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20549
 milestone: '12.6'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/packages_package_file_build_infos.yml b/db/docs/packages_package_file_build_infos.yml
index 6a0ab3f5b9d..f44c2bbeef8 100644
--- a/db/docs/packages_package_file_build_infos.yml
+++ b/db/docs/packages_package_file_build_infos.yml
@@ -17,5 +17,5 @@ desired_sharding_key:
         table: packages_package_files
         sharding_key: project_id
         belongs_to: package_file
-table_size: small
+table_size: medium
 desired_sharding_key_migration_job_name: BackfillPackagesPackageFileBuildInfosProjectId
diff --git a/db/docs/packages_package_files.yml b/db/docs/packages_package_files.yml
index df7a29adef7..110537ca9f9 100644
--- a/db/docs/packages_package_files.yml
+++ b/db/docs/packages_package_files.yml
@@ -10,4 +10,4 @@ milestone: '11.3'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/packages_packages.yml b/db/docs/packages_packages.yml
index fa563be8582..1a8df8a31cb 100644
--- a/db/docs/packages_packages.yml
+++ b/db/docs/packages_packages.yml
@@ -24,4 +24,4 @@ milestone: '11.3'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/personal_access_tokens.yml b/db/docs/personal_access_tokens.yml
index 9ab5cf36192..3fac5c638fc 100644
--- a/db/docs/personal_access_tokens.yml
+++ b/db/docs/personal_access_tokens.yml
@@ -10,4 +10,4 @@ milestone: '8.9'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   organization_id: organizations
-table_size: small
+table_size: large
diff --git a/db/docs/pm_package_version_licenses.yml b/db/docs/pm_package_version_licenses.yml
index 7361e485083..10ff105f54d 100644
--- a/db/docs/pm_package_version_licenses.yml
+++ b/db/docs/pm_package_version_licenses.yml
@@ -8,4 +8,4 @@ description: Tracks licenses under which a given package version has been publis
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102794
 milestone: '15.6'
 gitlab_schema: gitlab_pm
-table_size: small
+table_size: medium
diff --git a/db/docs/pm_package_versions.yml b/db/docs/pm_package_versions.yml
index 50b7b08bf75..ece2a2c507a 100644
--- a/db/docs/pm_package_versions.yml
+++ b/db/docs/pm_package_versions.yml
@@ -8,4 +8,4 @@ description: Tracks package versions served by public package registries.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102794
 milestone: '15.6'
 gitlab_schema: gitlab_pm
-table_size: small
+table_size: medium
diff --git a/db/docs/project_authorizations.yml b/db/docs/project_authorizations.yml
index 7227256735c..1672906eaf0 100644
--- a/db/docs/project_authorizations.yml
+++ b/db/docs/project_authorizations.yml
@@ -11,4 +11,4 @@ milestone: '8.14'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/project_daily_statistics.yml b/db/docs/project_daily_statistics.yml
index b4f3c1514ca..8fdf6870f2f 100644
--- a/db/docs/project_daily_statistics.yml
+++ b/db/docs/project_daily_statistics.yml
@@ -10,4 +10,4 @@ milestone: '11.9'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/project_features.yml b/db/docs/project_features.yml
index 011db1f241b..21a90a3f7cd 100644
--- a/db/docs/project_features.yml
+++ b/db/docs/project_features.yml
@@ -11,4 +11,4 @@ milestone: '8.12'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/project_repositories.yml b/db/docs/project_repositories.yml
index ff469e07ea8..d08ca5ba3a7 100644
--- a/db/docs/project_repositories.yml
+++ b/db/docs/project_repositories.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8614
 milestone: '11.6'
 gitlab_schema: gitlab_main_cell_local
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/524718
-table_size: small
+table_size: medium
diff --git a/db/docs/project_statistics.yml b/db/docs/project_statistics.yml
index 75b8fc6ac35..4b5bb308f57 100644
--- a/db/docs/project_statistics.yml
+++ b/db/docs/project_statistics.yml
@@ -23,4 +23,4 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_project_statistics_on_repository_size_and_project_id
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158614
-table_size: small
+table_size: medium
diff --git a/db/docs/projects.yml b/db/docs/projects.yml
index 1df5113f1c5..ea2bf0a766c 100644
--- a/db/docs/projects.yml
+++ b/db/docs/projects.yml
@@ -29,4 +29,4 @@ schema_inconsistencies:
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137884
 sharding_key:
   namespace_id: namespaces
-table_size: small
+table_size: large
diff --git a/db/docs/push_event_payloads.yml b/db/docs/push_event_payloads.yml
index f9b70ddc602..323e77d6443 100644
--- a/db/docs/push_event_payloads.yml
+++ b/db/docs/push_event_payloads.yml
@@ -8,7 +8,7 @@ description: Stores log of push events
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12463
 milestone: '9.5'
 gitlab_schema: gitlab_main_cell
-table_size: small
+table_size: over_limit
 desired_sharding_key:
   project_id:
     references: projects
diff --git a/db/docs/releases.yml b/db/docs/releases.yml
index 31a484144dd..cba84ada499 100644
--- a/db/docs/releases.yml
+++ b/db/docs/releases.yml
@@ -10,4 +10,4 @@ milestone: '8.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/resource_label_events.yml b/db/docs/resource_label_events.yml
index fcf0fa860f2..ed957467160 100644
--- a/db/docs/resource_label_events.yml
+++ b/db/docs/resource_label_events.yml
@@ -10,4 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6697
 milestone: '11.2'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514594
-table_size: small
+table_size: over_limit
diff --git a/db/docs/resource_state_events.yml b/db/docs/resource_state_events.yml
index d533b72b2eb..ee41a4ede7e 100644
--- a/db/docs/resource_state_events.yml
+++ b/db/docs/resource_state_events.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28926
 milestone: '13.0'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514592
-table_size: small
+table_size: medium
diff --git a/db/docs/routes.yml b/db/docs/routes.yml
index 1d37e79f7ab..eb2f0fbe256 100644
--- a/db/docs/routes.yml
+++ b/db/docs/routes.yml
@@ -11,4 +11,4 @@ milestone: '9.0'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
-table_size: small
+table_size: medium
diff --git a/db/docs/sbom_occurrences.yml b/db/docs/sbom_occurrences.yml
index 9f8dd5e71f6..b6b1a679582 100644
--- a/db/docs/sbom_occurrences.yml
+++ b/db/docs/sbom_occurrences.yml
@@ -13,4 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/security_scans.yml b/db/docs/security_scans.yml
index ccebc19ff36..f3b73d7d90e 100644
--- a/db/docs/security_scans.yml
+++ b/db/docs/security_scans.yml
@@ -10,4 +10,4 @@ milestone: '12.8'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: large
diff --git a/db/docs/sent_notifications.yml b/db/docs/sent_notifications.yml
index 1fe2e0398e4..737cbc9044c 100644
--- a/db/docs/sent_notifications.yml
+++ b/db/docs/sent_notifications.yml
@@ -10,4 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11
 milestone: '8.0'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514591
-table_size: small
+table_size: over_limit
diff --git a/db/docs/system_note_metadata.yml b/db/docs/system_note_metadata.yml
index 27a2c365e0c..25fdf011cce 100644
--- a/db/docs/system_note_metadata.yml
+++ b/db/docs/system_note_metadata.yml
@@ -9,4 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1c3c7fb25d972fc
 milestone: '9.1'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514589
-table_size: small
+table_size: over_limit
diff --git a/db/docs/todos.yml b/db/docs/todos.yml
index 6a5d16e5aaf..18b7d9de184 100644
--- a/db/docs/todos.yml
+++ b/db/docs/todos.yml
@@ -12,4 +12,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   group_id: namespaces
-table_size: small
+table_size: over_limit
diff --git a/db/docs/uploads.yml b/db/docs/uploads.yml
index d7c70280f07..437e6d28df3 100644
--- a/db/docs/uploads.yml
+++ b/db/docs/uploads.yml
@@ -16,4 +16,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/4c622b71fd28405
 milestone: '9.0'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398199
-table_size: small
+table_size: large
diff --git a/db/docs/uploads_9ba88c4165.yml b/db/docs/uploads_9ba88c4165.yml
index 873cf243b2a..b84476360cf 100644
--- a/db/docs/uploads_9ba88c4165.yml
+++ b/db/docs/uploads_9ba88c4165.yml
@@ -14,6 +14,6 @@ description: For tracking blob metadata. Single table inheritance is used to rel
   this table to many other tables. Partitioned by model_type.
 introduced_by_url:
 milestone: '17.11'
-table_size: medium
+table_size: small
 gitlab_schema: gitlab_main_cell
 exempt_from_sharding: true
diff --git a/db/docs/user_agent_details.yml b/db/docs/user_agent_details.yml
index 09097ce2dea..5de19e6233f 100644
--- a/db/docs/user_agent_details.yml
+++ b/db/docs/user_agent_details.yml
@@ -8,4 +8,4 @@ description: Stores user agent details for submission to Akismet spam detection.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5538
 milestone: '8.11'
 gitlab_schema: gitlab_main_clusterwide
-table_size: small
+table_size: medium
diff --git a/db/docs/users.yml b/db/docs/users.yml
index 6e7b05805f7..4a79585b5b2 100644
--- a/db/docs/users.yml
+++ b/db/docs/users.yml
@@ -21,4 +21,4 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_users_on_email_trigram
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152249
-table_size: small
+table_size: medium
diff --git a/db/docs/vulnerabilities.yml b/db/docs/vulnerabilities.yml
index 892f7364216..1b986112c6f 100644
--- a/db/docs/vulnerabilities.yml
+++ b/db/docs/vulnerabilities.yml
@@ -11,4 +11,4 @@ milestone: '12.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: large
diff --git a/db/docs/vulnerability_finding_links.yml b/db/docs/vulnerability_finding_links.yml
index 2f796e2b15c..a3b3fc8d161 100644
--- a/db/docs/vulnerability_finding_links.yml
+++ b/db/docs/vulnerability_finding_links.yml
@@ -8,6 +8,6 @@ description: Stores URLs relevant to the vulnerability findings
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46555
 milestone: '13.6'
 gitlab_schema: gitlab_sec
-table_size: small
+table_size: over_limit
 sharding_key:
   project_id: projects
diff --git a/db/docs/vulnerability_historical_statistics.yml b/db/docs/vulnerability_historical_statistics.yml
index 2a6c808eb6e..f92007edf29 100644
--- a/db/docs/vulnerability_historical_statistics.yml
+++ b/db/docs/vulnerability_historical_statistics.yml
@@ -11,4 +11,4 @@ milestone: '13.3'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/vulnerability_identifiers.yml b/db/docs/vulnerability_identifiers.yml
index add18992d2c..320415a638f 100644
--- a/db/docs/vulnerability_identifiers.yml
+++ b/db/docs/vulnerability_identifiers.yml
@@ -11,4 +11,4 @@ milestone: '11.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/vulnerability_occurrence_identifiers.yml b/db/docs/vulnerability_occurrence_identifiers.yml
index a9d5b0a143f..9b80437a765 100644
--- a/db/docs/vulnerability_occurrence_identifiers.yml
+++ b/db/docs/vulnerability_occurrence_identifiers.yml
@@ -10,4 +10,4 @@ milestone: '11.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: medium
diff --git a/db/docs/vulnerability_occurrences.yml b/db/docs/vulnerability_occurrences.yml
index d77263c9dae..0601ce1fdd4 100644
--- a/db/docs/vulnerability_occurrences.yml
+++ b/db/docs/vulnerability_occurrences.yml
@@ -10,4 +10,4 @@ milestone: '11.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/vulnerability_reads.yml b/db/docs/vulnerability_reads.yml
index bf38a8c2f1c..39197086a65 100644
--- a/db/docs/vulnerability_reads.yml
+++ b/db/docs/vulnerability_reads.yml
@@ -10,4 +10,4 @@ milestone: '14.6'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
-table_size: small
+table_size: over_limit
diff --git a/db/docs/vulnerability_state_transitions.yml b/db/docs/vulnerability_state_transitions.yml
index 3a4d8029cfb..5ce2ee9d7c9 100644
--- a/db/docs/vulnerability_state_transitions.yml
+++ b/db/docs/vulnerability_state_transitions.yml
@@ -12,6 +12,6 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_vulnerability_state_transitions_resolved_activity
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176561
-table_size: small
+table_size: medium
 sharding_key:
   project_id: projects
diff --git a/db/docs/zoekt_repositories.yml b/db/docs/zoekt_repositories.yml
index 8e4160f77ed..b0e54b46c62 100644
--- a/db/docs/zoekt_repositories.yml
+++ b/db/docs/zoekt_repositories.yml
@@ -8,4 +8,4 @@ description: Represents a zoekt repository
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141864
 milestone: '16.9'
 gitlab_schema: gitlab_main_cell_local
-table_size: small
+table_size: large
diff --git a/db/migrate/20240212170304_add_ancestors_column_to_sbom_occurrences.rb b/db/migrate/20240212170304_add_ancestors_column_to_sbom_occurrences.rb
index 459ce27da38..d387fbcbb58 100644
--- a/db/migrate/20240212170304_add_ancestors_column_to_sbom_occurrences.rb
+++ b/db/migrate/20240212170304_add_ancestors_column_to_sbom_occurrences.rb
@@ -6,7 +6,9 @@ class AddAncestorsColumnToSbomOccurrences < Gitlab::Database::Migration[2.2]
   enable_lock_retries!
 
   def up
+    # rubocop:disable Migration/PreventAddingColumns -- large tables
     add_column :sbom_occurrences, :ancestors, :jsonb, default: [], null: false
+    # rubocop:enable Migration/PreventAddingColumns
   end
 
   def down
diff --git a/db/migrate/20240320110318_add_file_final_path_to_packages_package_files.rb b/db/migrate/20240320110318_add_file_final_path_to_packages_package_files.rb
index 2f9c166ea25..202b982bb35 100644
--- a/db/migrate/20240320110318_add_file_final_path_to_packages_package_files.rb
+++ b/db/migrate/20240320110318_add_file_final_path_to_packages_package_files.rb
@@ -6,7 +6,9 @@ class AddFileFinalPathToPackagesPackageFiles < Gitlab::Database::Migration[2.2]
 
   def up
     with_lock_retries do
+      # rubocop:disable Migration/PreventAddingColumns -- large tables
       add_column :packages_package_files, :file_final_path, :text, if_not_exists: true
+      # rubocop:enable Migration/PreventAddingColumns
     end
 
     add_text_limit :packages_package_files, :file_final_path, 1024
diff --git a/db/migrate/20240729130349_add_project_id_to_packages_package_files.rb b/db/migrate/20240729130349_add_project_id_to_packages_package_files.rb
index 264f28f8886..d5ff214e786 100644
--- a/db/migrate/20240729130349_add_project_id_to_packages_package_files.rb
+++ b/db/migrate/20240729130349_add_project_id_to_packages_package_files.rb
@@ -4,6 +4,8 @@ class AddProjectIdToPackagesPackageFiles < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
   def change
+    # rubocop:disable Migration/PreventAddingColumns -- large tables
     add_column :packages_package_files, :project_id, :bigint
+    # rubocop:enable Migration/PreventAddingColumns
   end
 end
diff --git a/db/migrate/20240805081832_add_reachability_column_to_sbom_occurances_table.rb b/db/migrate/20240805081832_add_reachability_column_to_sbom_occurances_table.rb
index 7648f1da32d..ca767040e28 100644
--- a/db/migrate/20240805081832_add_reachability_column_to_sbom_occurances_table.rb
+++ b/db/migrate/20240805081832_add_reachability_column_to_sbom_occurances_table.rb
@@ -4,7 +4,9 @@ class AddReachabilityColumnToSbomOccurancesTable < Gitlab::Database::Migration[2
   milestone '17.4'
   def up
     with_lock_retries do
+      # rubocop:disable Migration/PreventAddingColumns -- large tables
       add_column :sbom_occurrences, :reachability, :smallint, default: 0 # -- Legacy migration
+      # rubocop:enable Migration/PreventAddingColumns
     end
   end
 
diff --git a/db/migrate/20240910202602_add_null_project_id_index_to_zoekt_repos.rb b/db/migrate/20240910202602_add_null_project_id_index_to_zoekt_repos.rb
index 8ce82eb6157..84bb9b5f2ea 100644
--- a/db/migrate/20240910202602_add_null_project_id_index_to_zoekt_repos.rb
+++ b/db/migrate/20240910202602_add_null_project_id_index_to_zoekt_repos.rb
@@ -7,7 +7,9 @@ class AddNullProjectIdIndexToZoektRepos < Gitlab::Database::Migration[2.2]
   INDEX_NAME = "index_zoekt_repos_with_missing_project_id"
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :zoekt_repositories, :project_id, name: INDEX_NAME, where: "project_id IS NULL"
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/migrate/20250304132248_add_project_id_to_approval_merge_request_rules_users.rb b/db/migrate/20250304132248_add_project_id_to_approval_merge_request_rules_users.rb
index b4b10ffbedb..6a15d94bb68 100644
--- a/db/migrate/20250304132248_add_project_id_to_approval_merge_request_rules_users.rb
+++ b/db/migrate/20250304132248_add_project_id_to_approval_merge_request_rules_users.rb
@@ -4,6 +4,8 @@ class AddProjectIdToApprovalMergeRequestRulesUsers < Gitlab::Database::Migration
   milestone '17.10'
 
   def change
+    # rubocop:disable Migration/PreventAddingColumns -- large tables
     add_column :approval_merge_request_rules_users, :project_id, :bigint
+    # rubocop:enable Migration/PreventAddingColumns
   end
 end
diff --git a/db/post_migrate/20240325085002_add_index_approval_mr_rules_on_config_id_and_id_and_updated_at.rb b/db/post_migrate/20240325085002_add_index_approval_mr_rules_on_config_id_and_id_and_updated_at.rb
index 4890424996e..d988de578d9 100644
--- a/db/post_migrate/20240325085002_add_index_approval_mr_rules_on_config_id_and_id_and_updated_at.rb
+++ b/db/post_migrate/20240325085002_add_index_approval_mr_rules_on_config_id_and_id_and_updated_at.rb
@@ -9,7 +9,9 @@ class AddIndexApprovalMrRulesOnConfigIdAndIdAndUpdatedAt < Gitlab::Database::Mig
   TABLE_NAME = :approval_merge_request_rules
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index(TABLE_NAME, %i[security_orchestration_policy_configuration_id id updated_at], name: INDEX_NAME)
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20240501044348_index_approval_merge_request_rules_on_project_id.rb b/db/post_migrate/20240501044348_index_approval_merge_request_rules_on_project_id.rb
index ebbb3845667..d831c366d53 100644
--- a/db/post_migrate/20240501044348_index_approval_merge_request_rules_on_project_id.rb
+++ b/db/post_migrate/20240501044348_index_approval_merge_request_rules_on_project_id.rb
@@ -7,7 +7,9 @@ class IndexApprovalMergeRequestRulesOnProjectId < Gitlab::Database::Migration[2.
   INDEX_NAME = 'index_approval_merge_request_rules_on_project_id'
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :approval_merge_request_rules, :project_id, name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20240604082631_prepare_async_index_policy_rule_id_on_approval_merge_request_rules.rb b/db/post_migrate/20240604082631_prepare_async_index_policy_rule_id_on_approval_merge_request_rules.rb
index 9bd8ba8914a..aec33e16b79 100644
--- a/db/post_migrate/20240604082631_prepare_async_index_policy_rule_id_on_approval_merge_request_rules.rb
+++ b/db/post_migrate/20240604082631_prepare_async_index_policy_rule_id_on_approval_merge_request_rules.rb
@@ -7,7 +7,9 @@ class PrepareAsyncIndexPolicyRuleIdOnApprovalMergeRequestRules < Gitlab::Databas
 
   # TODO: Index to be created synchronously as part of https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155256
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     prepare_async_index :approval_merge_request_rules, :approval_policy_rule_id, name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20240604111411_add_approval_policy_rules_fk_on_approval_merge_request_rules.rb b/db/post_migrate/20240604111411_add_approval_policy_rules_fk_on_approval_merge_request_rules.rb
index 2558b0c1508..e1e81dce2da 100644
--- a/db/post_migrate/20240604111411_add_approval_policy_rules_fk_on_approval_merge_request_rules.rb
+++ b/db/post_migrate/20240604111411_add_approval_policy_rules_fk_on_approval_merge_request_rules.rb
@@ -7,7 +7,9 @@ class AddApprovalPolicyRulesFkOnApprovalMergeRequestRules < Gitlab::Database::Mi
   INDEX_NAME = 'index_approval_merge_request_rules_on_approval_policy_rule_id'
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :approval_merge_request_rules, :approval_policy_rule_id, name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
     add_concurrent_foreign_key :approval_merge_request_rules, :approval_policy_rules,
       column: :approval_policy_rule_id,
       on_delete: :cascade
diff --git a/db/post_migrate/20240624053511_extend_uploads_index.rb b/db/post_migrate/20240624053511_extend_uploads_index.rb
index 87d37bdaf84..f8799694f0f 100644
--- a/db/post_migrate/20240624053511_extend_uploads_index.rb
+++ b/db/post_migrate/20240624053511_extend_uploads_index.rb
@@ -7,7 +7,9 @@ class ExtendUploadsIndex < Gitlab::Database::Migration[2.2]
   INDEX_NAME = 'index_uploads_on_model_id_model_type_uploader_created_at'
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :uploads, [:model_id, :model_type, :uploader, :created_at], name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20240627060258_add_index_to_uploads_on_uploaded_by_user_id.rb b/db/post_migrate/20240627060258_add_index_to_uploads_on_uploaded_by_user_id.rb
index aff7b122095..f14324c7906 100644
--- a/db/post_migrate/20240627060258_add_index_to_uploads_on_uploaded_by_user_id.rb
+++ b/db/post_migrate/20240627060258_add_index_to_uploads_on_uploaded_by_user_id.rb
@@ -7,7 +7,9 @@ class AddIndexToUploadsOnUploadedByUserId < Gitlab::Database::Migration[2.2]
   INDEX_NAME = 'index_uploads_on_uploaded_by_user_id'
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :uploads, :uploaded_by_user_id, name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20241018135537_add_index_approval_merge_request_rules_on_mr_id_config_id_and_id.rb b/db/post_migrate/20241018135537_add_index_approval_merge_request_rules_on_mr_id_config_id_and_id.rb
index 03850dca420..da37041fdb1 100644
--- a/db/post_migrate/20241018135537_add_index_approval_merge_request_rules_on_mr_id_config_id_and_id.rb
+++ b/db/post_migrate/20241018135537_add_index_approval_merge_request_rules_on_mr_id_config_id_and_id.rb
@@ -9,9 +9,11 @@ class AddIndexApprovalMergeRequestRulesOnMrIdConfigIdAndId < Gitlab::Database::M
   TABLE_NAME = :approval_merge_request_rules
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index(
       TABLE_NAME, %i[merge_request_id security_orchestration_policy_configuration_id id], name: INDEX_NAME
     )
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20241031233000_add_index_merge_request_id_on_security_policy_approval_merge_request_rules.rb b/db/post_migrate/20241031233000_add_index_merge_request_id_on_security_policy_approval_merge_request_rules.rb
index ad4efda2a61..a3ea7b8b2d8 100644
--- a/db/post_migrate/20241031233000_add_index_merge_request_id_on_security_policy_approval_merge_request_rules.rb
+++ b/db/post_migrate/20241031233000_add_index_merge_request_id_on_security_policy_approval_merge_request_rules.rb
@@ -13,8 +13,10 @@ class AddIndexMergeRequestIdOnSecurityPolicyApprovalMergeRequestRules < Gitlab::
   disable_ddl_transaction!
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index :approval_merge_request_rules, :merge_request_id,
       where: "report_type IN (#{SECURITY_POLICIES_REPORT_TYPES.join(', ')})", name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20241113122160_add_index_approval_merge_request_rules_on_config_and_approval_policy_rule.rb b/db/post_migrate/20241113122160_add_index_approval_merge_request_rules_on_config_and_approval_policy_rule.rb
index afeba22f9db..e8f229d44db 100644
--- a/db/post_migrate/20241113122160_add_index_approval_merge_request_rules_on_config_and_approval_policy_rule.rb
+++ b/db/post_migrate/20241113122160_add_index_approval_merge_request_rules_on_config_and_approval_policy_rule.rb
@@ -9,8 +9,10 @@ class AddIndexApprovalMergeRequestRulesOnConfigAndApprovalPolicyRule < Gitlab::D
   TABLE_NAME = :approval_merge_request_rules
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index(TABLE_NAME, %i[security_orchestration_policy_configuration_id approval_policy_rule_id],
       name: INDEX_NAME)
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20241114225508_add_index_approval_mr_rules_on_project_id_policy_rule_id_and_id.rb b/db/post_migrate/20241114225508_add_index_approval_mr_rules_on_project_id_policy_rule_id_and_id.rb
index d125e02b502..1f31f0638ea 100644
--- a/db/post_migrate/20241114225508_add_index_approval_mr_rules_on_project_id_policy_rule_id_and_id.rb
+++ b/db/post_migrate/20241114225508_add_index_approval_mr_rules_on_project_id_policy_rule_id_and_id.rb
@@ -9,8 +9,10 @@ class AddIndexApprovalMrRulesOnProjectIdPolicyRuleIdAndId < Gitlab::Database::Mi
   TABLE_NAME = :approval_merge_request_rules
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index(TABLE_NAME, %i[security_orchestration_policy_configuration_id approval_policy_rule_id id],
       name: INDEX_NAME)
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20250115101224_add_index_zoekt_index_id_and_state_on_zoekt_repositories.rb b/db/post_migrate/20250115101224_add_index_zoekt_index_id_and_state_on_zoekt_repositories.rb
index e2080010b22..b318e304b3d 100644
--- a/db/post_migrate/20250115101224_add_index_zoekt_index_id_and_state_on_zoekt_repositories.rb
+++ b/db/post_migrate/20250115101224_add_index_zoekt_index_id_and_state_on_zoekt_repositories.rb
@@ -8,7 +8,9 @@ class AddIndexZoektIndexIdAndStateOnZoektRepositories < Gitlab::Database::Migrat
   TABLE_NAME = :zoekt_repositories
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index(TABLE_NAME, %i[zoekt_index_id state], name: INDEX_NAME)
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20250210122558_add_zoekt_repositories_index_on_size_bytes.rb b/db/post_migrate/20250210122558_add_zoekt_repositories_index_on_size_bytes.rb
index 99b53a52df9..3aecb1d3fab 100644
--- a/db/post_migrate/20250210122558_add_zoekt_repositories_index_on_size_bytes.rb
+++ b/db/post_migrate/20250210122558_add_zoekt_repositories_index_on_size_bytes.rb
@@ -8,7 +8,9 @@ class AddZoektRepositoriesIndexOnSizeBytes < Gitlab::Database::Migration[2.2]
   TABLE_NAME = 'zoekt_repositories'
 
   def up
+    # rubocop:disable Migration/PreventIndexCreation -- large tables
     add_concurrent_index TABLE_NAME, [:zoekt_index_id, :size_bytes], name: INDEX_NAME
+    # rubocop:enable Migration/PreventIndexCreation
   end
 
   def down
diff --git a/db/post_migrate/20250331050258_sync_index_for_p_ci_pipeline_trigger_id_and_id.rb b/db/post_migrate/20250331050258_sync_index_for_p_ci_pipeline_trigger_id_and_id.rb
new file mode 100644
index 00000000000..5c400e16e01
--- /dev/null
+++ b/db/post_migrate/20250331050258_sync_index_for_p_ci_pipeline_trigger_id_and_id.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class SyncIndexForPCiPipelineTriggerIdAndId < Gitlab::Database::Migration[2.2]
+  include Gitlab::Database::PartitioningMigrationHelpers
+  include Gitlab::Database::MigrationHelpers::WraparoundAutovacuum
+
+  milestone '17.11'
+  disable_ddl_transaction!
+
+  TABLE_NAME = :p_ci_pipelines
+  COLUMN_NAMES = [:trigger_id, :id]
+  INDEX_NAME = :p_ci_pipelines_trigger_id_id_desc_idx
+  INDEX_ORDER = { id: :desc }
+
+  def up
+    return unless can_execute_on?(:ci_pipelines)
+
+    add_concurrent_partitioned_index(TABLE_NAME, COLUMN_NAMES, name: INDEX_NAME, order: INDEX_ORDER)
+  end
+
+  def down
+    return unless can_execute_on?(:ci_pipelines)
+
+    remove_concurrent_partitioned_index_by_name(TABLE_NAME, INDEX_NAME)
+  end
+end
diff --git a/db/schema_migrations/20250331050258 b/db/schema_migrations/20250331050258
new file mode 100644
index 00000000000..2775f285433
--- /dev/null
+++ b/db/schema_migrations/20250331050258
@@ -0,0 +1 @@
+ef8a5499a1f17d6b52d28f98cf09f2ffe70a14ae926c056a6a943ca27f285af0
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index c113bb1d54d..f116b9f19dc 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -34451,6 +34451,10 @@ CREATE UNIQUE INDEX index_cycle_analytics_stage_event_hashes_on_org_id_sha_256 O
 
 CREATE INDEX index_d58435d85e ON project_type_ci_runner_machines USING btree (executor_type);
 
+CREATE INDEX p_ci_pipelines_trigger_id_id_desc_idx ON ONLY p_ci_pipelines USING btree (trigger_id, id DESC);
+
+CREATE INDEX index_d8ae6ea3f3 ON ci_pipelines USING btree (trigger_id, id DESC);
+
 CREATE UNIQUE INDEX index_daily_build_group_report_results_unique_columns ON ci_daily_build_group_report_results USING btree (project_id, ref_path, date, group_name);
 
 CREATE INDEX index_dast_pre_scan_verification_steps_on_project_id ON dast_pre_scan_verification_steps USING btree (project_id);
@@ -40487,6 +40491,8 @@ ALTER INDEX p_ci_stages_project_id_idx ATTACH PARTITION index_ci_stages_on_proje
 
 ALTER INDEX index_ci_runner_machines_on_executor_type ATTACH PARTITION index_d58435d85e;
 
+ALTER INDEX p_ci_pipelines_trigger_id_id_desc_idx ATTACH PARTITION index_d8ae6ea3f3;
+
 ALTER INDEX p_ci_builds_user_id_name_idx ATTACH PARTITION index_partial_ci_builds_on_user_id_name_parser_features;
 
 ALTER INDEX p_ci_pipeline_variables_pipeline_id_key_partition_id_idx ATTACH PARTITION index_pipeline_variables_on_pipeline_id_key_partition_id_unique;
diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md
index 7f58cf348df..a0101610f5d 100644
--- a/doc/api/graphql/reference/_index.md
+++ b/doc/api/graphql/reference/_index.md
@@ -39644,6 +39644,7 @@ Represents a vulnerability.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="vulnerabilityabouttobearchived"></a>`aboutToBeArchived` {{< icon name="warning-solid" >}} | [`Boolean!`](#boolean) | **Introduced** in GitLab 17.11. **Status**: Experiment. Indicates whether the vulnerability is about to be archived in the next month. |
 | <a id="vulnerabilityairesolutionavailable"></a>`aiResolutionAvailable` | [`Boolean`](#boolean) | Indicates whether the type of vulnerability can be resolved with AI. |
 | <a id="vulnerabilityairesolutionenabled"></a>`aiResolutionEnabled` | [`Boolean`](#boolean) | Indicates whether the specific vulnerability can be resolved with AI. |
 | <a id="vulnerabilitycommenters"></a>`commenters` | [`UserCoreConnection!`](#usercoreconnection) | All commenters on the noteable. (see [Connections](#connections)) |
diff --git a/doc/api/group_access_tokens.md b/doc/api/group_access_tokens.md
index 0a0c75c4a2e..bbb667df73a 100644
--- a/doc/api/group_access_tokens.md
+++ b/doc/api/group_access_tokens.md
@@ -280,5 +280,5 @@ If successful, returns `204 No content`.
 
 Other possible responses:
 
-- `400 Bad Request`: Token was not revoked.
-- `404 Not Found`: Token can not be found.
+- `400: Bad Request` if not revoked successfully.
+- `404: Not Found` if the access token does not exist.
diff --git a/doc/api/group_service_accounts.md b/doc/api/group_service_accounts.md
index e565856b682..3e5404d5abf 100644
--- a/doc/api/group_service_accounts.md
+++ b/doc/api/group_service_accounts.md
@@ -250,6 +250,49 @@ Example response:
 }
 ```
 
+## Revoke a personal access token for a service account user
+
+{{< history >}}
+
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184287) in GitLab 17.10
+
+{{< /history >}}
+
+Revokes a personal access token for an existing service account user in a given top-level group.
+
+{{< alert type="note" >}}
+
+This endpoint only works on top-level groups.
+
+{{< /alert >}}
+
+```plaintext
+DELETE /groups/:id/service_accounts/:user_id/personal_access_tokens/:token_id
+```
+
+Parameters:
+
+| Attribute    | Type            | Required | Description |
+| ------------ | --------------- | -------- | ----------- |
+| `id`         | integer/string | yes  | The ID or [URL-encoded path of the target group](rest/_index.md#namespaced-paths). |
+| `user_id`    | integer | yes      | The ID of the service account user.                            |
+| `token_id`   | integer | yes      | The ID of the token. |
+
+Example request:
+
+```shell
+curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/35/service_accounts/71/personal_access_tokens/6"
+```
+
+If successful, returns `204: No Content`.
+
+Other possible responses:
+
+- `400: Bad Request` if not revoked successfully.
+- `401: Unauthorized` if the request is not authorized.
+- `403: Forbidden` if the request is not allowed.
+- `404: Not Found` if the access token does not exist.
+
 ## Rotate a personal access token for a service account user
 
 {{< history >}}
diff --git a/doc/api/personal_access_tokens.md b/doc/api/personal_access_tokens.md
index 666191eed2f..0aa78b0dc69 100644
--- a/doc/api/personal_access_tokens.md
+++ b/doc/api/personal_access_tokens.md
@@ -278,8 +278,8 @@ If successful, returns `204: No Content`.
 Other possible responses:
 
 - `400: Bad Request` if not revoked successfully.
-- `401: Unauthorized` if the access token is invalid.
-- `403: Forbidden` if the access token does not have the required permissions.
+- `401: Unauthorized` if the request is not authorized.
+- `403: Forbidden` if the request is not allowed.
 
 ### Self-revoke
 
diff --git a/doc/api/project_access_tokens.md b/doc/api/project_access_tokens.md
index f8acba9c9fc..b5b4e226ab7 100644
--- a/doc/api/project_access_tokens.md
+++ b/doc/api/project_access_tokens.md
@@ -279,5 +279,5 @@ If successful, returns `204 No content`.
 
 Other possible responses:
 
-- `400 Bad Request`: Token was not revoked.
-- `404 Not Found`: Token can not be found.
+- `400: Bad Request` if not revoked successfully.
+- `404: Not Found` if the access token does not exist.
diff --git a/doc/development/documentation/metadata.md b/doc/development/documentation/metadata.md
index fc2164ae974..e1d1a66edc4 100644
--- a/doc/development/documentation/metadata.md
+++ b/doc/development/documentation/metadata.md
@@ -121,6 +121,15 @@ For pages with partial availability on GitLab Dedicated, use `gitlab_dedicated:
 and update the [product availability details](styleguide/availability_details.md)
 for any topics that don't apply to GitLab Dedicated.
 
+## Indicate lack of product availability details
+
+On pages that purposely do not have availability details, add this metadata to the
+top of the page:
+
+```yaml
+availability_details: no
+```
+
 ## Additional metadata
 
 The following metadata is optional and is not actively maintained.
diff --git a/doc/development/documentation/styleguide/availability_details.md b/doc/development/documentation/styleguide/availability_details.md
index d81e08b6247..8d86ad2494c 100644
--- a/doc/development/documentation/styleguide/availability_details.md
+++ b/doc/development/documentation/styleguide/availability_details.md
@@ -231,6 +231,8 @@ For example, if a feature applies to one tier for GitLab.com and a different ava
 
 In this case, do any or all of the following:
 
+- Use [metadata](../metadata.md#indicate-lack-of-product-availability-details)
+  to indicate that the page has been reviewed and does not need availability details.
 - Use a [`type="note"`](_index.md#note) alert box to describe the availability details.
 - Add availability details under other topic titles where this information makes more sense.
 - Do not add availability details under the H1.
diff --git a/doc/development/merge_request_concepts/rate_limits.md b/doc/development/merge_request_concepts/rate_limits.md
index 61d7d58eb10..fcf24b3c03b 100644
--- a/doc/development/merge_request_concepts/rate_limits.md
+++ b/doc/development/merge_request_concepts/rate_limits.md
@@ -25,3 +25,5 @@ Limits are applicable for:
 - Existing [GitLab application limits](../../administration/instance_limits.md)
 - Product processes: [introducing application limits](https://handbook.gitlab.com/handbook/product/product-processes/#introducing-application-limits)
 - Development documentation: [guide for adding application limits](../application_limits.md)
+- Infrastructure guide to rate limits: [rate limit architecture](https://handbook.gitlab.com/handbook/engineering/infrastructure/rate-limiting/)
+- A guide for when, where, and how to configure rate limits: [managing rate limits](https://handbook.gitlab.com/handbook/engineering/infrastructure/rate-limiting/managing-limits/)
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 755124a24a7..a43a07cb659 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -160,9 +160,9 @@ This will generate:
 Changes to the schema should be committed to `db/structure.sql`. This
 file is automatically generated by Rails when you run
 `bundle exec rails db:migrate`, so you typically should not
-edit this file by hand. If your migration is adding a column to a
-table, that column is added at the bottom. Do not reorder
-columns manually for existing tables as this causes confusion to
+edit this file by hand. If your migration adds a column to a
+table, that column is appended to that table's schema by the migration. Do not reorder
+columns manually for existing tables as this causes conflicts for
 other people using `db/structure.sql` generated by Rails.
 
 {{< alert type="note" >}}
diff --git a/doc/development/python_guide/create_project.md b/doc/development/python_guide/create_project.md
index f20fecaabe9..59faa9069a4 100644
--- a/doc/development/python_guide/create_project.md
+++ b/doc/development/python_guide/create_project.md
@@ -110,6 +110,147 @@ indent-size = 4
 max-line-length = 120
 ```
 
+## Example Makefile
+
+```makefile
+# Excerpt from project Makefile showing common targets
+
+# lint
+.PHONY: install-lint-deps
+install-lint-deps:
+    @echo "Installing lint dependencies..."
+    @poetry install --only lint
+
+.PHONY: format
+format: black isort
+
+.PHONY: black
+black: install-lint-deps
+    @echo "Running black format..."
+    @poetry run black ${CI_PROJECT_DIR}
+
+.PHONY: isort
+isort: install-lint-deps
+    @echo "Running isort format..."
+    @poetry run isort ${CI_PROJECT_DIR}
+
+.PHONY: lint
+lint: flake8 check-black check-isort check-pylint check-mypy
+
+.PHONY: flake8
+flake8: install-lint-deps
+    @echo "Running flake8..."
+    @poetry run flake8 ${CI_PROJECT_DIR}
+
+.PHONY: check-black
+check-black: install-lint-deps
+    @echo "Running black check..."
+    @poetry run black --check ${CI_PROJECT_DIR}
+
+.PHONY: check-isort
+check-isort: install-lint-deps
+    @echo "Running isort check..."
+    @poetry run isort --check-only ${CI_PROJECT_DIR}
+
+.PHONY: check-pylint
+check-pylint: install-lint-deps install-test-deps
+    @echo "Running pylint check..."
+    @poetry run pylint ${CI_PROJECT_DIR}
+
+.PHONY: check-mypy
+check-mypy: install-lint-deps
+    @echo "Running mypy check..."
+    @poetry run mypy ${CI_PROJECT_DIR}
+
+# test
+.PHONY: test
+test: install-test-deps
+    @echo "Running tests..."
+    @poetry run pytest
+
+.PHONY: test-coverage
+test-coverage: install-test-deps
+    @echo "Running tests with coverage..."
+    @poetry run pytest --cov=duo_workflow_service --cov=lints --cov-report term --cov-report html
+```
+
+## Example GitLab CI Configuration
+
+```yaml
+# Excerpt from .gitlab-ci.yml showing linting and testing jobs
+
+image: python:3.13
+
+stages:
+  - lint
+  - test
+
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  POETRY_CACHE_DIR: "$CI_PROJECT_DIR/.cache/poetry"
+  POETRY_VERSION: "2.1.2"
+
+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - $PIP_CACHE_DIR
+    - $POETRY_CACHE_DIR
+    - .venv/
+
+# Base template for Python jobs
+.poetry:
+  before_script:
+    - pip install poetry==${POETRY_VERSION}
+    - poetry config virtualenvs.in-project true
+    - poetry add --dev black isort flake8 pylint mypy pytest pytest-cov
+
+# Linting jobs
+black:
+  extends: .poetry
+  stage: lint
+  script:
+    - poetry run black --check ${CI_PROJECT_DIR}
+
+isort:
+  extends: .poetry
+  stage: lint
+  script:
+    - poetry run isort --check-only ${CI_PROJECT_DIR}
+
+flake8:
+  extends: .poetry
+  stage: lint
+  script:
+    - poetry run flake8 ${CI_PROJECT_DIR}
+
+pylint:
+  extends: .poetry
+  stage: lint
+  script:
+    - poetry run pylint ${CI_PROJECT_DIR}
+
+mypy:
+  extends: .poetry
+  stage: lint
+  script:
+    - poetry run mypy ${CI_PROJECT_DIR}
+
+# Testing jobs
+test:
+  extends: .poetry
+  stage: test
+  script:
+    - poetry run pytest --cov=duo_workflow_service --cov-report=term --cov-report=xml:coverage.xml --junitxml=junit.xml
+  coverage: '/TOTAL.+?(\d+\%)/'
+  artifacts:
+    when: always
+    reports:
+      junit: junit.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+```
+
 ## Adding reviewer roulette
 
 We recommend reviewer roulette to distribute review workload across reviewers and maintainers. A pool of Python Reviewers is available 
diff --git a/doc/development/python_guide/maintainership.md b/doc/development/python_guide/maintainership.md
index f2d3a729b16..3b7aec15777 100644
--- a/doc/development/python_guide/maintainership.md
+++ b/doc/development/python_guide/maintainership.md
@@ -99,7 +99,39 @@ In addition to code reviews, maintainers are responsible for guiding architectur
 When writing and reviewing code, follow our Style Guides. Code authors and reviewers are encouraged to pay attention
 to these areas:
 
-[Work item](https://gitlab.com/gitlab-org/gitlab/-/issues/507548).
+## Review focus areas
+
+When reviewing Python code at GitLab, consider the following areas:
+
+### 1. Code style
+
+- Code follows our agreed [Python formatting standards](styleguide.md) (enforced in pipeline).
+- Naming conventions are clear and descriptive.
+- Docstrings are used for all public functions and classes.
+
+### 2. Code quality
+
+- Functions are focused, not overly complex and testable.
+- Code is readable without excessive comments.
+- No unused code or commented-out code.
+
+### 3. Testing
+
+- Test coverage is adequate for new code.
+- Tests follow the naming convention `test_{file_being_tested}.py`.
+- Mocks are used appropriately for external dependencies.
+
+### 4. Documentation
+
+- Functions and classes have clear docstrings.
+- Complex logic has explanatory comments.
+- Documentation is updated when adding features.
+
+### 5. Security
+
+- Code follows GitLab security guidelines.
+- Inputs are properly validated.
+- Error handling is appropriate.
 
 ### Backward Compatibility Requirements
 
diff --git a/doc/development/python_guide/styleguide.md b/doc/development/python_guide/styleguide.md
index d2ce9151f9b..7ee8df8032d 100644
--- a/doc/development/python_guide/styleguide.md
+++ b/doc/development/python_guide/styleguide.md
@@ -86,7 +86,7 @@ def test_get_product_price(argument1, argument2, expected_result):
         "expected_response",
     ),
     [
-      # Test case 1: 
+      # Test case 1:
       (
         "value1",
         {
@@ -136,3 +136,29 @@ class TestMyFunction:
 - Use `unittest.mock` library.
 - Mock at the right level, for example, at method call boundaries.
 - Mock external services and APIs.
+
+## Code style
+
+It's recommended to use automated tools to ensure code quality and security.
+Consider running the following tools in your CI pipeline as well as locally:
+
+### Formatting tools
+
+- **Black**: Code formatter that enforces a consistent style
+- **isort**: Sorts and organizes import statements
+
+### Linting tools
+
+- **flake8**: Checks for PEP-8 compliance and common errors
+- **pylint**: More comprehensive linter for code quality
+- **mypy**: Static type checker for Python
+
+### Testing tools
+
+- **pytest**: Testing framework with coverage reporting
+
+### Security tools
+
+- **Dependency scanning**: Checks for vulnerabilities in dependencies
+- **Secret detection**: Ensures no secrets are committed to the repository
+- **SAST (semgrep)**: Static Application Security Testing
diff --git a/doc/downgrade_ee_to_ce/_index.md b/doc/downgrade_ee_to_ce/_index.md
index a601a788893..13fb50898ee 100644
--- a/doc/downgrade_ee_to_ce/_index.md
+++ b/doc/downgrade_ee_to_ce/_index.md
@@ -2,36 +2,32 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-title: Downgrading from EE to CE
+title: Revert from Enterprise Edition to Community Edition
 ---
 
-If you ever decide to downgrade your Enterprise Edition (EE) back to the
-Community Edition (CE), there are a few steps you need to take beforehand:
+You can revert your Enterprise Edition (EE) instance back to Community Edition (CE), but must first:
 
-- For Linux package installations, these steps are done before installing the CE package on top of the current EE
-  package.
-- For self-compiled installations, these steps are done before you change remotes and fetch the latest CE code.
+1. Disable EE-only authentication mechanisms.
+1. Remove EE-only integrations from the database.
+1. Adjust configuration that uses environment scopes.
 
-## Disable Enterprise-only features
+## Turn off EE-only authentication mechanisms
 
-First thing to do is to disable the following features.
+Kerberos is only available on EE instances. You must:
 
-### Authentication mechanisms
+- Turn off these mechanisms before reverting.
+- Provide a different authentication method to your users.
 
-Kerberos and Atlassian Crowd are only available on the Enterprise Edition. You
-should disable these mechanisms before downgrading. Be sure to provide
-alternative authentication methods to your users.
+## Remove EE-only integrations from the database
 
-### Remove Enterprise-only integrations from the database
-
-The following integrations are only available in the Enterprise Edition codebase:
+These integrations are only available in the EE codebase:
 
 - [GitHub](../user/project/integrations/github.md)
 - [Git Guardian](../user/project/integrations/git_guardian.md)
 - [Google Artifact Management](../user/project/integrations/google_artifact_management.md)
 - [Google Cloud IAM](../integration/google_cloud_iam.md)
 
-If you downgrade to the Community Edition, the following error displays:
+If you downgrade to CE, you might get something like the following error:
 
 ```plaintext
 Completed 500 Internal Server Error in 497ms (ActiveRecord: 32.2ms)
@@ -78,43 +74,45 @@ bundle exec rails runner "Integration.where(type_new: ['Integrations::GoogleClou
 
 {{< /tabs >}}
 
-### Variables environment scopes
+## Adjust configuration that uses environment scopes
 
-In GitLab Community Edition, [environment scopes](../user/group/clusters/_index.md#environment-scopes)
-are completely ignored, so if you are using this feature there may be some
-necessary adjustments to your configuration. This is especially true if
-configuration variables share the same key, but have different
-scopes in a project. In cases like these you could accidentally get a variable
-which you're not expecting for a particular environment. Make sure that you have
-the right variables in this case.
+If you use [environment scopes](../user/group/clusters/_index.md#environment-scopes), you might need to adjust your
+configuration, especially if configuration variables share the same key, but have different scopes.
+Environment scopes are completely ignored in CE.
 
-Your data is completely preserved in the transition, so you could always upgrade
-back to EE and restore the behavior if you leave it alone.
+With configuration variables that share a key but different scopes, you could accidentally get a variable that you're
+not expecting for a particular environment. Make sure that you have the right variables in this case.
 
-## Downgrade to CE
+Your data is completely preserved in the transition, so you can change back to EE and restore the behavior.
 
-After performing the above mentioned steps, you are now ready to downgrade your
-GitLab installation to the Community Edition.
+## Revert to CE
 
-Remember to follow the correct [update guides](../update/_index.md) to make sure all dependencies are up to date.
+After performing the necessary steps, you can revert your GitLab instance to CE.
 
-### Linux package installations
+Follow the correct [update guides](../update/_index.md) to make sure all dependencies are up to date.
 
-To downgrade a Linux package installation, you can install the Community Edition package on top of
-the currently installed one. You can do this manually, by either:
+{{< tabs >}}
+
+{{< tab title="Linux package (Omnibus)" >}}
+
+Install the CE package on top of EE by either:
 
 - Directly [downloading the package](https://packages.gitlab.com/gitlab/gitlab-ce).
-- Adding our CE package repository and following the  [CE installation instructions](https://about.gitlab.com/install/?version=ce).
+- Adding the CE package repository and following the [CE installation instructions](https://about.gitlab.com/install/?version=ce).
 
-### Self-compiled installations
+{{< /tab >}}
 
-To downgrade a self-compiled installation:
+{{< tab title="Self-compiled (source)" >}}
 
-1. Replace the current remote of your GitLab installation with the Community Edition remote.
-1. Fetch the latest changes, and check out the latest stable branch:
+1. Replace the current Git remote of your GitLab installation with the CE Git remote.
+1. Fetch the latest changes and check out the latest stable branch. For example:
 
    ```shell
    git remote set-url origin git@gitlab.com:gitlab-org/gitlab-foss.git
    git fetch --all
-   git checkout 8-x-stable
+   git checkout 17-8-stable
    ```
+
+{{< /tab >}}
+
+{{< /tabs >}}
diff --git a/doc/install/docker/installation.md b/doc/install/docker/installation.md
index 83a7ed11970..21e24452abc 100644
--- a/doc/install/docker/installation.md
+++ b/doc/install/docker/installation.md
@@ -2,6 +2,7 @@
 stage: Systems
 group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+description: Learn about the prerequisites, strategies, and steps for installing GitLab in a Docker container.
 title: Install GitLab in a Docker container
 ---
 
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index c79d7d13560..aada4596049 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -221,6 +221,13 @@ Here's an example of a resource-based (domain) access policy where `es:ESHttp*`
 }
 ```
 
+{{< alert type="note" >}}
+
+The `aws_role_arn` must be provided if using [AWS `AssumeRole`](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html)
+across accounts. The ARN should be the role that has permissions to access OpenSearch.
+
+{{< /alert >}}
+
 ###### Identity-based policy examples
 
 Here's an example of an identity-based access policy attached to an IAM principal where `es:ESHttp*` actions are allowed:
diff --git a/doc/subscriptions/subscription-add-ons.md b/doc/subscriptions/subscription-add-ons.md
index 81637a9cfa3..5465d925034 100644
--- a/doc/subscriptions/subscription-add-ons.md
+++ b/doc/subscriptions/subscription-add-ons.md
@@ -126,7 +126,7 @@ You can assign or remove seats in bulk for multiple users.
 
 ### SAML Group Sync
 
-GitLab.com groups can use SAML Group Sync to [manage GitLab Duo seat assignments](../user/group/saml_sso/group_sync.md#gitlab-duo-seat-assignment).
+GitLab.com groups can use SAML Group Sync to [manage GitLab Duo seat assignments](../user/group/saml_sso/group_sync.md#manage-gitlab-duo-seat-assignment).
 
 ### For GitLab.com
 
diff --git a/doc/update/package/convert_to_ee.md b/doc/update/package/convert_to_ee.md
index fb1bde5e912..508d445ec32 100644
--- a/doc/update/package/convert_to_ee.md
+++ b/doc/update/package/convert_to_ee.md
@@ -145,3 +145,8 @@ To convert a Linux package CE instance to EE:
 
 That's it! You can now use GitLab Enterprise Edition! To upgrade to a newer
 version, follow [Upgrading Linux package instances](_index.md).
+
+## Revert back to CE
+
+For information on reverting an EE instance to CE, see
+[how to revert from EE to CE](../../downgrade_ee_to_ce/_index.md).
diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md
index a170e85f3ae..ddd4e58ed54 100644
--- a/doc/update/upgrading_from_ce_to_ee.md
+++ b/doc/update/upgrading_from_ce_to_ee.md
@@ -133,3 +133,6 @@ If you encounter problems converting to EE and want to revert back to CE:
    cd /home/git/gitlab
    sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
    ```
+
+For information on reverting an EE instance to CE, see
+[how to revert from EE to CE](../downgrade_ee_to_ce/_index.md).
diff --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index 94cc299bbfa..46d311dc2c5 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -18,16 +18,6 @@ title: SAML Group Sync
 
 {{< /history >}}
 
-{{< alert type="warning" >}}
-
-Adding or changing Group Sync configuration can remove users from the mapped GitLab group.
-Removal happens if there is any mismatch between the group names and the list of `groups` in the SAML response.
-Before making changes, ensure either the SAML response includes the `groups` attribute
-and the `AttributeValue` value matches the **SAML Group Name** in GitLab,
-or that all groups are removed from GitLab to disable Group Sync.
-
-{{< /alert >}}
-
 Use SAML group sync to assign users with specific roles to existing GitLab groups,
 based on the users' group assignment in the SAML identity provider (IdP).
 With SAML group sync you can create a many-to-many mapping between SAML IdP groups and GitLab groups.
@@ -39,87 +29,21 @@ and to the `vulnerability` group with Reporter role.
 SAML group sync does not create groups.
 You have to first [create a group](../_index.md#create-a-group), then create the mapping.
 
+On GitLab.com, SAML group sync is configured by default.
+On GitLab Self-Managed, you must configure it manually.
+
 ## Role prioritization
 
 Group sync determines the role and membership type of a user in the mapped group.
 
-### Multiple SAML groups
-
-If a user is a member of multiple SAML groups that map to the same GitLab group, the user is assigned the highest role from any of those SAML groups.
-
-For example, if a user has the Guest role in a group and the Maintainer role in another group, they are assigned the Maintainer role.
-
-### Membership types
-
-If a user's role in a SAML group is higher than their role in one of its subgroups, their [membership](../../project/members/_index.md#display-direct-members) in the mapped GitLab group is different based on their assigned role in the mapped group.
-
-If through group sync the user was assigned:
-
-- A higher role, they are a direct member of the group.
-- A role that is the same as or lower, they are an inherited member of the group.
-
-## Configure SAML Group Links
-
-SAML Group Sync only manages a group if that group has one or more SAML group links.
-
-Prerequisites:
-
-- Your GitLab Self-Managed instance must have configured [SAML Group Sync](#configure-saml-group-sync). GitLab.com
-  instances are already configured for SAML Group Sync, and require no extra configuration.
-
-When SAML is enabled, users with the Owner role see a new menu
-item in group **Settings > SAML Group Links**.
-
-- You can configure one or more **SAML Group Links** to map a SAML IdP group name to a GitLab role.
-- Members of the SAML IdP group are added as members of the GitLab
-  group on their next SAML sign-in.
-- Group membership is evaluated each time a user signs in using SAML.
-- SAML Group Links can be configured for a top-level group or any subgroup.
-- If a SAML group link is created then removed, and there are:
-  - Other SAML group links configured, users that were in the removed group
-    link are automatically removed from the group during sync.
-  - No other SAML group links configured, users remain in the group during sync.
-    Those users must be manually removed from the group.
-
-To link the SAML groups:
-
-1. In **SAML Group Name**, enter the value of the relevant `saml:AttributeValue`. The value entered here must exactly match the value sent in the SAML response. For some IdPs, this may be a group ID or object ID (Azure AD) instead of a friendly group name.
-1. Choose a [default role](../../permissions.md) or [custom role](../../custom_roles/_index.md) in **Access Level**.
-1. Select **Save**.
-1. Repeat to add additional group links if required.
-
-![SAML Group Links](img/saml_group_links_v17_8.png)
-
-### GitLab Duo seat assignment
+### Multiple SAML IdPs
 
 {{< details >}}
 
-- Tier: Premium, Ultimate
-- Offering: GitLab.com
+- Offering: GitLab Self-Managed
 
 {{< /details >}}
 
-{{< history >}}
-
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/480766) for GitLab.com in GitLab 17.8 [with a flag](../../../administration/feature_flags.md) named `saml_groups_duo_pro_add_on_assignment`. Disabled by default.
-
-{{< /history >}}
-
-Prerequisites:
-
-- An active [GitLab Duo add-on subscription](../../../subscriptions/subscription-add-ons.md)
-
-SAML Group Sync can manage GitLab Duo seat assignment and removal based on IdP group membership. Seats are only assigned when there are seats remaining in the subscription.
-
-1. When [configuring a SAML Group Link](#configure-saml-group-links), select the **Assign GitLab Duo seats to users in this group** checkbox.
-1. Select **Save**.
-1. Repeat to add additional group links for all SAML users that should be assigned a GitLab Duo Pro or GitLab Duo Enterprise seat.
-   GitLab Duo seats are unassigned for users whose identity provider group memberships do not match a group link with this setting enabled.
-
-The checkbox does not appear for groups without an active GitLab Duo add-on subscription.
-
-### GitLab Self-Managed with multiple SAML IdPs
-
 When a user signs in, GitLab:
 
 - Checks all the configured SAML group links.
@@ -147,22 +71,47 @@ Now let's change the previous example so that the user is not a member of either
 - When the user signs in to a group with `SAML1`, the user is given the `Owner` role in that group.
 - When the user signs in with `SAML2`, the user is removed from the group because they are not a member of either configured group link.
 
+### Multiple SAML groups
+
+If a user is a member of multiple SAML groups that map to the same GitLab group, the user is assigned the highest role from any of those SAML groups.
+
+For example, if a user has the Guest role in a group and the Maintainer role in another group, they are assigned the Maintainer role.
+
+### Membership types
+
+If a user's role in a SAML group is higher than their role in one of its subgroups, their [membership](../../project/members/_index.md#display-direct-members) in the mapped GitLab group is different based on their assigned role in the mapped group.
+
+If through group sync the user was assigned:
+
+- A higher role, they are a direct member of the group.
+- A role that is the same as or lower, they are an inherited member of the group.
+
 ## Configure SAML Group Sync
 
-{{< alert type="note" >}}
+Adding or changing a group sync configuration may remove users from the mapped GitLab group,
+if the group names don't match the listed `groups` in the SAML response.
+To avoid users being removed, before configuring group sync, ensure either:
 
-You must include the SAML configuration block on all Sidekiq nodes in addition to Rails application nodes if you use SAML Group Sync and have multiple GitLab nodes, for example in a distributed or highly available architecture.
+- The SAML response includes the `groups` attribute and the `AttributeValue` value matches the **SAML Group Name** in GitLab.
+- All groups are removed from GitLab to disable Group Sync.
 
-{{< /alert >}}
+If you use SAML Group Sync and have multiple GitLab nodes, for example in a distributed or highly available architecture,
+you must include the SAML configuration block on all Sidekiq nodes in addition to Rails application nodes.
 
-{{< alert type="warning" >}}
+{{< tabs >}}
 
-To prevent users being accidentally removed from the GitLab group, follow these instructions closely before
-enabling Group Sync in GitLab.
+{{< tab title="GitLab.com" >}}
 
-{{< /alert >}}
+To configure SAML Group Sync:
 
-To configure SAML Group Sync for GitLab Self-Managed:
+1. See [SAML SSO for GitLab.com groups](_index.md).
+1. Ensure your SAML identity provider sends an attribute statement named `Groups` or `groups`.
+
+{{< /tab >}}
+
+{{< tab title="GitLab Self-Managed" >}}
+
+To configure SAML Group Sync:
 
 1. Configure the [SAML OmniAuth Provider](../../../integration/saml.md).
 1. Ensure your SAML identity provider sends an attribute statement with the same name as the value of the `groups_attribute` setting. This attribute is case-sensitive. See the following provider configuration example in `/etc/gitlab/gitlab.rb` for reference:
@@ -184,18 +133,13 @@ To configure SAML Group Sync for GitLab Self-Managed:
    ]
    ```
 
-To configure SAML Group Sync for **GitLab.com instances**:
+{{< /tab >}}
 
-1. See [SAML SSO for GitLab.com groups](_index.md).
-1. Ensure your SAML identity provider sends an attribute statement named `Groups` or `groups`.
-
-{{< alert type="note" >}}
+{{< /tabs >}}
 
 The value for `Groups` or `groups` in the SAML response may be either the group name or an ID.
 For example, Azure AD sends the Azure Group Object ID instead of the name. Use the ID value when configuring [SAML Group Links](#configure-saml-group-links).
 
-{{< /alert >}}
-
 ```xml
 <saml:AttributeStatement>
   <saml:Attribute Name="Groups">
@@ -212,6 +156,65 @@ For more information on configuring the
 required group attribute name in the SAML identity provider's settings, see
 example configurations for [Azure AD](example_saml_config.md#group-sync) and [Okta](example_saml_config.md#group-sync-1).
 
+## Configure SAML group links
+
+SAML Group Sync only manages a group if that group has one or more SAML group links.
+
+Prerequisites:
+
+- Your GitLab Self-Managed instance must have configured SAML Group Sync.
+
+When SAML is enabled, users with the Owner role see a new menu
+item in group **Settings > SAML Group Links**.
+
+- You can configure one or more **SAML Group Links** to map a SAML IdP group name to a GitLab role.
+- Members of the SAML IdP group are added as members of the GitLab
+  group on their next SAML sign-in.
+- Group membership is evaluated each time a user signs in using SAML.
+- SAML Group Links can be configured for a top-level group or any subgroup.
+- If a SAML group link is created then removed, and there are:
+  - Other SAML group links configured, users that were in the removed group
+    link are automatically removed from the group during sync.
+  - No other SAML group links configured, users remain in the group during sync.
+    Those users must be manually removed from the group.
+
+To link the SAML groups:
+
+1. In **SAML Group Name**, enter the value of the relevant `saml:AttributeValue`. The value entered here must exactly match the value sent in the SAML response. For some IdPs, this may be a group ID or object ID (Azure AD) instead of a friendly group name.
+1. Choose a [default role](../../permissions.md) or [custom role](../../custom_roles/_index.md) in **Access Level**.
+1. Select **Save**.
+1. Repeat to add additional group links if required.
+
+![SAML Group Links](img/saml_group_links_v17_8.png)
+
+## Manage GitLab Duo seat assignment
+
+{{< details >}}
+
+- Tier: Premium, Ultimate
+- Offering: GitLab.com
+
+{{< /details >}}
+
+{{< history >}}
+
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/480766) for GitLab.com in GitLab 17.8 [with a flag](../../../administration/feature_flags.md) named `saml_groups_duo_pro_add_on_assignment`. Disabled by default.
+
+{{< /history >}}
+
+Prerequisites:
+
+- An active [GitLab Duo add-on subscription](../../../subscriptions/subscription-add-ons.md)
+
+SAML Group Sync can manage GitLab Duo seat assignment and removal based on IdP group membership. Seats are only assigned when there are seats remaining in the subscription.
+
+1. When [configuring a SAML Group Link](#configure-saml-group-links), select the **Assign GitLab Duo seats to users in this group** checkbox.
+1. Select **Save**.
+1. Repeat to add additional group links for all SAML users that should be assigned a GitLab Duo Pro or GitLab Duo Enterprise seat.
+   GitLab Duo seats are unassigned for users whose identity provider group memberships do not match a group link with this setting enabled.
+
+The checkbox does not appear for groups without an active GitLab Duo add-on subscription.
+
 ## Microsoft Azure Active Directory integration
 
 {{< history >}}
@@ -240,12 +243,12 @@ as the [configured](_index.md#azure) Unique User Identifier (Name identifier) at
 When the integration processes Group Sync, only Group Links configured with
 group unique identifiers (like `12345678-9abc-def0-1234-56789abcde`) are supported.
 
-To integrate Microsoft Azure AD, you:
+To integrate Microsoft Azure AD, you must:
 
-- Configure Azure AD to enable GitLab to communicate with the Microsoft Graph API.
-- Configure GitLab.
+1. Configure Azure AD to enable GitLab to communicate with the Microsoft Graph API.
+1. Configure GitLab.
 
-### GitLab settings to Azure AD fields
+The following table lists the GitLab settings and the corresponding Azure AD fields for the configuration:
 
 | GitLab setting | Azure field                                |
 | -------------- | ------------------------------------------ |
@@ -275,7 +278,15 @@ To integrate Microsoft Azure AD, you:
 
 ### Configure GitLab
 
-To configure for a GitLab.com group:
+With this configuration, if a user signs in with SAML and Azure sends a group overage claim in the response,
+GitLab initiates a Group Sync job to call the Microsoft Graph API and retrieve the user's group membership.
+Then the GitLab group membership is updated according to SAML Group Links.
+
+{{< tabs >}}
+
+{{< tab title="GitLab.com" >}}
+
+To configure Azure AD for a GitLab.com group:
 
 1. On the left sidebar, select **Search or go to** and find your group.
    This group must be at the top level.
@@ -287,6 +298,10 @@ To configure for a GitLab.com group:
 1. Optional. If using Azure AD for US Government or Azure AD China, enter the appropriate **Login API endpoint** and **Graph API endpoint**. The default values work for most organizations.
 1. Select **Save changes**.
 
+{{< /tab >}}
+
+{{< tab title="GitLab Self-Managed" >}}
+
 To configure for GitLab Self-Managed:
 
 1. Configure [SAML SSO for the instance](../../../integration/saml.md).
@@ -297,9 +312,9 @@ To configure for GitLab Self-Managed:
 1. Optional. If using Azure AD for US Government or Azure AD China, enter the appropriate **Login API endpoint** and **Graph API endpoint**. The default values work for most organizations.
 1. Select **Save changes**.
 
-With this configuration, if a user signs in with SAML and Azure sends a group overage claim in the response,
-GitLab initiates a Group Sync job to call the Microsoft Graph API and retrieve the user's group membership.
-Then the GitLab Group membership is updated according to SAML Group Links.
+{{< /tab >}}
+
+{{< /tabs >}}
 
 ## Global SAML group memberships lock
 
@@ -447,8 +462,7 @@ that user may lose their group memberships.
 For more information, see
 [Microsoft Group overages](https://learn.microsoft.com/en-us/security/zero-trust/develop/configure-tokens-group-claims-app-roles#group-overages).
 
-GitLab has a [Microsoft Azure Active Directory integration](#microsoft-azure-active-directory-integration) that enables SAML Group Sync for organizations
-with users in more than 150 groups. This integration uses the Microsoft Graph API to obtain all user memberships and is
+The Microsoft Azure AD integration uses the Microsoft Graph API to obtain all user memberships and is
 not limited to 150 groups.
 
 Otherwise, you can work around this issue by changing the [group claims](https://learn.microsoft.com/en-us/entra/identity/hybrid/connect/how-to-connect-fed-group-claims#configure-the-microsoft-entra-application-registration-for-group-attributes) to use the `Groups assigned to the application` option instead.
diff --git a/doc/user/okrs.md b/doc/user/okrs.md
index 566f1f1c9d0..839eafb625d 100644
--- a/doc/user/okrs.md
+++ b/doc/user/okrs.md
@@ -2,6 +2,7 @@
 stage: Plan
 group: Product Planning
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+description: Learn how to create, edit, and maintain objectives and key results (OKRs).
 title: Objectives and key results (OKR)
 ---
 
diff --git a/doc/user/project/pages/_index.md b/doc/user/project/pages/_index.md
index b260b2dd517..f2db3800e28 100644
--- a/doc/user/project/pages/_index.md
+++ b/doc/user/project/pages/_index.md
@@ -72,9 +72,10 @@ For more information, see:
 To use GitLab Pages, you must create a project in GitLab to upload your website's
 files to. These projects can be either public, internal, or private.
 
-GitLab always deploys your website from a specific folder called `public` in your
-repository. When you create a new project in GitLab, a [repository](../repository/_index.md)
-becomes available automatically.
+By default, GitLab deploys your website from a specific folder called `public` in your
+repository.
+You can also [set a custom folder to be deployed with Pages](introduction.md#customize-the-default-folder).
+When you create a new project in GitLab, a [repository](../repository/_index.md) becomes available automatically.
 
 To deploy your site, GitLab uses its built-in tool called [GitLab CI/CD](../../../ci/_index.md)
 to build your site and publish it to the GitLab Pages server. The sequence of
diff --git a/doc/user/project/pages/getting_started/pages_ui.md b/doc/user/project/pages/getting_started/pages_ui.md
index c3d226fc7d4..6dfd25ac929 100644
--- a/doc/user/project/pages/getting_started/pages_ui.md
+++ b/doc/user/project/pages/getting_started/pages_ui.md
@@ -50,7 +50,7 @@ To complete the setup and generate a GitLab Pages deployment:
 
    A **Get Started with Pages** form appears. If this form is not available,
    see [Troubleshooting](#if-the-get-started-with-pages-form-is-not-available).
-1. For **Step 1**, enter an image name and verify that your files are in a `public` folder.
+1. For **Step 1**, enter an image name. You can also [set a custom folder to be deployed with Pages](../introduction.md#customize-the-default-folder).
 1. Select **Next**.
 1. For **Step 2**, enter your installation steps. If your framework's build process does not
    need one of the provided build commands, you can either:
diff --git a/lib/banzai/filter/playable_link_filter.rb b/lib/banzai/filter/playable_link_filter.rb
index 289aa6b2ca7..8dc419380e6 100644
--- a/lib/banzai/filter/playable_link_filter.rb
+++ b/lib/banzai/filter/playable_link_filter.rb
@@ -41,10 +41,10 @@ module Banzai
 
       def media_element(doc, element)
         media_element_attrs = {
-            src: element['src'],
-            controls: true,
-            'data-setup': '{}',
-            'data-title': element['title'] || element['alt']
+          src: element['src'],
+          controls: true,
+          'data-setup': '{}',
+          'data-title': element['title'] || element['alt']
         }.merge!(extra_element_attrs(element))
 
         if element['data-canonical-src']
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index a1835331a2d..61a22ec50be 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -180,7 +180,7 @@ module ContainerRegistry
       return true if protection_rule.immutable?
       return false if user.can_admin_all_resources?
 
-      max_access = user.max_member_access_for_project(repository.project_id)
+      max_access = repository.project.team.max_member_access(user.id)
       protection_rule.delete_restricted?(max_access)
     end
 
diff --git a/lib/gitlab/application_rate_limiter.rb b/lib/gitlab/application_rate_limiter.rb
index 45ab495209e..574950e00d3 100644
--- a/lib/gitlab/application_rate_limiter.rb
+++ b/lib/gitlab/application_rate_limiter.rb
@@ -235,9 +235,9 @@ module Gitlab
 
         if current_user
           request_information.merge!({
-                                       user_id: current_user.id,
-                                       username: current_user.username
-                                     })
+            user_id: current_user.id,
+            username: current_user.username
+          })
         end
 
         logger.error(request_information)
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index d6d936fbe55..2731a1ce9a0 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -19,23 +19,23 @@ module Gitlab
     MAX_INCLUDE_DEPTH = 3
     RENDER_TIMEOUT = 10.seconds
     DEFAULT_ADOC_ATTRS = {
-        'showtitle' => true,
-        'sectanchors' => true,
-        'idprefix' => Banzai::Renderer::USER_CONTENT_ID_PREFIX,
-        'idseparator' => '-',
-        'env' => 'gitlab',
-        'env-gitlab' => '',
-        'source-highlighter' => 'gitlab-html-pipeline',
-        'icons' => 'font',
-        'outfilesuffix' => '.adoc',
-        'max-include-depth' => MAX_INCLUDE_DEPTH,
-        # This feature is disabled because it relies on File#read to read the file.
-        # If we want to enable this feature we will need to provide a "GitLab compatible" implementation.
-        # This attribute is typically used to share common config (skinparam...) across all PlantUML diagrams.
-        # The value can be a path or a URL.
-        'kroki-plantuml-include!' => '',
-        # This feature is disabled because it relies on the local file system to save diagrams retrieved from the Kroki server.
-        'kroki-fetch-diagram!' => ''
+      'showtitle' => true,
+      'sectanchors' => true,
+      'idprefix' => Banzai::Renderer::USER_CONTENT_ID_PREFIX,
+      'idseparator' => '-',
+      'env' => 'gitlab',
+      'env-gitlab' => '',
+      'source-highlighter' => 'gitlab-html-pipeline',
+      'icons' => 'font',
+      'outfilesuffix' => '.adoc',
+      'max-include-depth' => MAX_INCLUDE_DEPTH,
+      # This feature is disabled because it relies on File#read to read the file.
+      # If we want to enable this feature we will need to provide a "GitLab compatible" implementation.
+      # This attribute is typically used to share common config (skinparam...) across all PlantUML diagrams.
+      # The value can be a path or a URL.
+      'kroki-plantuml-include!' => '',
+      # This feature is disabled because it relies on the local file system to save diagrams retrieved from the Kroki server.
+      'kroki-fetch-diagram!' => ''
     }.freeze
 
     def self.path_attrs(path)
@@ -71,11 +71,11 @@ module Gitlab
                         attributes: DEFAULT_ADOC_ATTRS
                                         .merge(extra_attrs)
                                         .merge({
-                                                   # Define the Kroki server URL from the settings.
-                                                   # This attribute cannot be overridden from the AsciiDoc document.
-                                                   'kroki-server-url' => Gitlab::CurrentSettings.kroki_url,
-                                                   'allow-uri-read' => Gitlab::CurrentSettings.wiki_asciidoc_allow_uri_includes
-                                               }),
+                                          # Define the Kroki server URL from the settings.
+                                          # This attribute cannot be overridden from the AsciiDoc document.
+                                          'kroki-server-url' => Gitlab::CurrentSettings.kroki_url,
+                                          'allow-uri-read' => Gitlab::CurrentSettings.wiki_asciidoc_allow_uri_includes
+                                        }),
                         extensions: extensions }
 
       context[:pipeline] = :ascii_doc
diff --git a/lib/gitlab/asciidoc/include_processor.rb b/lib/gitlab/asciidoc/include_processor.rb
index ae83dbedf04..d2dd76b6ec0 100644
--- a/lib/gitlab/asciidoc/include_processor.rb
+++ b/lib/gitlab/asciidoc/include_processor.rb
@@ -23,7 +23,7 @@ module Gitlab
         # Note: Asciidoctor calls #freeze on extensions, so we can't set new
         # instance variables after initialization.
         @cache = {
-            uri_types: {}
+          uri_types: {}
         }
       end
 
diff --git a/lib/gitlab/auth/otp/strategies/forti_token_cloud.rb b/lib/gitlab/auth/otp/strategies/forti_token_cloud.rb
index c4b65c6fea3..105de58b5f9 100644
--- a/lib/gitlab/auth/otp/strategies/forti_token_cloud.rb
+++ b/lib/gitlab/auth/otp/strategies/forti_token_cloud.rb
@@ -27,8 +27,8 @@ module Gitlab
               post(
                 url: url('/login'),
                 body: {
-                        client_id: ::Gitlab.config.forti_token_cloud.client_id,
-                        client_secret: ::Gitlab.config.forti_token_cloud.client_secret
+                  client_id: ::Gitlab.config.forti_token_cloud.client_id,
+                  client_secret: ::Gitlab.config.forti_token_cloud.client_secret
                 }.to_json
               )
             end
@@ -45,8 +45,8 @@ module Gitlab
               url: url('/auth'),
               headers: { Authorization: "Bearer #{access_token}" },
               body: {
-                      username: user.username,
-                      token: otp_code
+                username: user.username,
+                token: otp_code
               }.to_json
             )
           end
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 0df56903e21..3765e9ec317 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -169,11 +169,7 @@ module Gitlab
 
       def build_config(config, inputs)
         initial_config = logger.instrument(:config_yaml_load, once: true) do
-          if inputs.present?
-            Config::Yaml.load_with_inputs!(config, inputs, @context.variables)
-          else
-            Config::Yaml.load!(config)
-          end
+          Config::Yaml.load!(config, inputs, @context.variables)
         end
 
         initial_config = logger.instrument(:config_external_process, once: true) do
diff --git a/lib/gitlab/ci/config/entry/processable.rb b/lib/gitlab/ci/config/entry/processable.rb
index 8511d44cc46..7736a000635 100644
--- a/lib/gitlab/ci/config/entry/processable.rb
+++ b/lib/gitlab/ci/config/entry/processable.rb
@@ -30,10 +30,10 @@ module Gitlab
               validates :config, mutually_exclusive_keys: %i[run trigger]
 
               validates :config, disallowed_keys: {
-                  in: %i[only except start_in],
-                  message: 'key may not be used with `rules`',
-                  ignore_nil: true
-                }, if: :has_rules_value?
+                in: %i[only except start_in],
+                message: 'key may not be used with `rules`',
+                ignore_nil: true
+              }, if: :has_rules_value?
 
               with_options allow_nil: true do
                 validates :extends, array_of_strings_or_string: true
diff --git a/lib/gitlab/ci/config/yaml.rb b/lib/gitlab/ci/config/yaml.rb
index 1e37e056189..da5f3db209c 100644
--- a/lib/gitlab/ci/config/yaml.rb
+++ b/lib/gitlab/ci/config/yaml.rb
@@ -7,16 +7,7 @@ module Gitlab
         LoadError = Class.new(StandardError)
 
         class << self
-          def load!(content)
-            Loader.new(content).load.then do |result|
-              raise result.error_class, result.error if !result.valid? && result.error_class.present?
-              raise LoadError, result.error unless result.valid?
-
-              result.content
-            end
-          end
-
-          def load_with_inputs!(content, inputs, variables)
+          def load!(content, inputs = {}, variables = [])
             Loader.new(content, inputs: inputs, variables: variables).load.then do |result|
               raise result.error_class, result.error if !result.valid? && result.error_class.present?
               raise LoadError, result.error unless result.valid?
diff --git a/lib/gitlab/database/migrations/observers/query_details.rb b/lib/gitlab/database/migrations/observers/query_details.rb
index 1549f5bf626..dbf57e747eb 100644
--- a/lib/gitlab/database/migrations/observers/query_details.rb
+++ b/lib/gitlab/database/migrations/observers/query_details.rb
@@ -28,11 +28,11 @@ module Gitlab
 
           def record_sql_event(_name, started, finished, _unique_id, payload)
             @writer.push_value({
-                                 start_time: started.iso8601(6),
-                                 end_time: finished.iso8601(6),
-                                 sql: payload[:sql],
-                                 binds: payload[:type_casted_binds]
-                               })
+              start_time: started.iso8601(6),
+              end_time: finished.iso8601(6),
+              sql: payload[:sql],
+              binds: payload[:type_casted_binds]
+            })
           end
         end
       end
diff --git a/lib/gitlab/database/migrations/observers/transaction_duration.rb b/lib/gitlab/database/migrations/observers/transaction_duration.rb
index 7a7b4500a0f..2a80812688f 100644
--- a/lib/gitlab/database/migrations/observers/transaction_duration.rb
+++ b/lib/gitlab/database/migrations/observers/transaction_duration.rb
@@ -33,10 +33,10 @@ module Gitlab
               stack_count = payload[:connection].open_transactions
 
               @writer.push_value({
-                 start_time: started.iso8601(6),
-                 end_time: finished.iso8601(6),
-                 transaction_type: stack_count == 0 ? :real_transaction : :sub_transaction
-               })
+                start_time: started.iso8601(6),
+                end_time: finished.iso8601(6),
+                transaction_type: stack_count == 0 ? :real_transaction : :sub_transaction
+              })
             else
               return if payload[:transaction_type] == :fake_transaction
 
diff --git a/lib/gitlab/database/stat_activity.rb b/lib/gitlab/database/stat_activity.rb
index 5cfc3a880e5..290e9ba7dea 100644
--- a/lib/gitlab/database/stat_activity.rb
+++ b/lib/gitlab/database/stat_activity.rb
@@ -8,6 +8,30 @@ module Gitlab
 
       attr_reader :connection_name
 
+      # This class maintains a hash in Redis per database connection (main) and per application (sidekiq, web).
+      # The hash contains a key per database name `gitlabhq_production_sidekiq`, `gitlabhq_production_sidekiq_urgent`
+      # The payload of each entry in the hash is a json array with samples.
+      #
+      # The whole hash from Redis looks like this:
+      # key: gitlab:pg_stat_sampler:main:sidekiq:samples
+      # {
+      #   "gitlabhq_production_sidekiq": [
+      #     // a sample
+      #     {
+      #       "created_at": 1732543621,
+      #       "payload": {
+      #         "DetectRepositoryLanguagesWorker": {
+      #           "idle in transaction": 1
+      #         },
+      #         "ContainerRegistry::RecordDataRepairDetailWorker": {
+      #           "idle": 1,
+      #           "active": 2
+      #         }
+      #       }
+      #     }
+      #   ]
+      # }
+
       class << self
         def write(connection_name, sample)
           new(connection_name).write(sample)
@@ -24,6 +48,37 @@ module Gitlab
         end
       end
 
+      # Returns the total of non-idle connections aggregated from the last `min_samples`
+      # for each database name, eg `gitlabhq_production_sidekiq`, `gitlabhq_production_sidekiq_urgent`.
+      # Hash for each database will be empty if there are not enough samples in Redis to meet `min_samples`.
+      #
+      # Returns {
+      #   "gitlabhq_production_sidekiq": {
+      #     "WorkerA": 1,
+      #     "WorkerB": 2
+      #   },
+      #   gitlabhq_production_sidekiq_urgent: {
+      #     "WorkerC": 3
+      #   }
+      # }
+      def non_idle_connections_by_db(min_samples)
+        result = {}
+        samples_by_db.each do |db, samples|
+          result[db] = {}
+          parsed_samples = Gitlab::Json.parse(samples)
+
+          next if parsed_samples.length < min_samples
+
+          result[db] = parsed_samples.last(min_samples)
+                                     .map { |sample| non_idle_by_endpoints(sample) }
+                                     .reduce({}) do |res, hash|
+                                       res.merge(hash) { |_key, old_val, new_val| old_val + new_val }
+                                     end
+        end
+
+        result
+      end
+
       private
 
       def hash_key(application)
@@ -70,6 +125,16 @@ module Gitlab
           end
       end
 
+      def samples_by_db
+        with_redis { |c| c.hgetall(hash_key(Gitlab.process_name)) }
+      end
+
+      def non_idle_by_endpoints(sample)
+        sample["payload"].transform_values do |states|
+          states.reject { |state, _count| state == "idle" }.values.sum
+        end
+      end
+
       def with_redis(&)
         Gitlab::Redis::SharedState.with(&)
       end
diff --git a/lib/gitlab/hook_data/release_builder.rb b/lib/gitlab/hook_data/release_builder.rb
index b15c260f4a8..3167c29cffa 100644
--- a/lib/gitlab/hook_data/release_builder.rb
+++ b/lib/gitlab/hook_data/release_builder.rb
@@ -24,9 +24,9 @@ module Gitlab
           url: Gitlab::UrlBuilder.build(release),
           action: action,
           assets: {
-              count: release.assets_count,
-              links: release.links.map(&:hook_attrs),
-              sources: release.sources.map(&:hook_attrs)
+            count: release.assets_count,
+            links: release.links.map(&:hook_attrs),
+            sources: release.sources.map(&:hook_attrs)
           },
           commit: release.commit.hook_attrs
         }
diff --git a/lib/gitlab/quick_actions/issuable_actions.rb b/lib/gitlab/quick_actions/issuable_actions.rb
index 73f4c359d13..8c268ba4a93 100644
--- a/lib/gitlab/quick_actions/issuable_actions.rb
+++ b/lib/gitlab/quick_actions/issuable_actions.rb
@@ -288,15 +288,15 @@ module Gitlab
                                         when :relabel
                                           _('Replaced all labels with %{label_references} %{label_text}.') %
                                             {
-                                            label_references: label_references.join(' '),
-                                            label_text: 'label'.pluralize(label_references.count)
-                                          }
+                                              label_references: label_references.join(' '),
+                                              label_text: 'label'.pluralize(label_references.count)
+                                            }
                                         when :label
                                           _('Added %{label_references} %{label_text}.') %
                                             {
-                                            label_references: label_references.join(' '),
-                                            label_text: 'label'.pluralize(labels.count)
-                                          }
+                                              label_references: label_references.join(' '),
+                                              label_text: 'label'.pluralize(labels.count)
+                                            }
                                         end
         end
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c285dd22340..f6d7dcba7f4 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2579,6 +2579,9 @@ msgstr ""
 msgid "AWS OpenSearch IAM credentials"
 msgstr ""
 
+msgid "AWS Role ARN"
+msgstr ""
+
 msgid "AWS Secret Access Key"
 msgstr ""
 
@@ -49886,6 +49889,9 @@ msgstr ""
 msgid "Required only if you are not using role instance credentials."
 msgstr ""
 
+msgid "Required only if you are using AssumeRole for authorization across accounts."
+msgstr ""
+
 msgid "Requirement"
 msgstr ""
 
@@ -57075,9 +57081,6 @@ msgstr ""
 msgid "Source (branch or tag)"
 msgstr ""
 
-msgid "Source Branch"
-msgstr ""
-
 msgid "Source IP:"
 msgstr ""
 
@@ -58640,9 +58643,6 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-msgid "Target Branch"
-msgstr ""
-
 msgid "Target Path"
 msgstr ""
 
@@ -61718,7 +61718,7 @@ msgstr ""
 msgid "Todos|Isn't an empty To-Do List beautiful?"
 msgstr ""
 
-msgid "Todos|Issue or Epic"
+msgid "Todos|Issue"
 msgstr ""
 
 msgid "Todos|It's how you always know what to work on next."
diff --git a/package.json b/package.json
index eabb3398a46..3089cce764c 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language-rust": "0.5.2",
     "@gitlab/svgs": "3.126.0",
-    "@gitlab/ui": "111.10.0",
+    "@gitlab/ui": "111.10.1",
     "@gitlab/vue-router-vue3": "npm:vue-router@4.5.0",
     "@gitlab/vuex-vue3": "npm:vuex@4.1.0",
     "@gitlab/web-ide": "^0.0.1-dev-20250320115735",
diff --git a/qa/qa/resource/snippet.rb b/qa/qa/resource/snippet.rb
index 1a18235fa93..7156ab210a3 100644
--- a/qa/qa/resource/snippet.rb
+++ b/qa/qa/resource/snippet.rb
@@ -56,10 +56,10 @@ module QA
 
       def api_post_body
         {
-            title: title,
-            description: description,
-            visibility: visibility.downcase,
-            files: all_file_contents
+          title: title,
+          description: description,
+          visibility: visibility.downcase,
+          files: all_file_contents
         }
       end
 
diff --git a/rubocop/rubocop-migrations.yml b/rubocop/rubocop-migrations.yml
index 07638074e22..a1dd431d321 100644
--- a/rubocop/rubocop-migrations.yml
+++ b/rubocop/rubocop-migrations.yml
@@ -1,27 +1,27 @@
 ---
 Migration/UpdateLargeTable:
   Enabled: true
-  OverLimitTables:
-  - :ci_builds_metadata
-  - :ci_builds_metadata_102
-  - :ci_builds_metadata_101
-  - :ci_builds
-  - :ci_pipelines
-  - :ci_builds_102
-  - :ci_builds_101
-  - :taggings
-  - :ci_job_artifacts
-  - :ci_build_needs
-  - :ci_stages
-  - :ci_pipeline_variables
-  - :ci_build_tags_100
-  - :ci_job_artifacts_102
+  OverLimitTables: &2
+  - :approval_merge_request_rules_users
   - :ci_build_names_102
-  - :ci_pipeline_variables_102
-  - :ci_build_tags_102
-  - :ci_build_tags_101
+  - :ci_build_needs
   - :ci_build_report_results
+  - :ci_build_tags_100
+  - :ci_build_tags_101
+  - :ci_build_tags_102
+  - :ci_builds
+  - :ci_builds_101
+  - :ci_builds_102
+  - :ci_builds_metadata
+  - :ci_builds_metadata_101
+  - :ci_builds_metadata_102
+  - :ci_job_artifacts
+  - :ci_job_artifacts_102
   - :ci_job_variables
+  - :ci_pipeline_variables
+  - :ci_pipeline_variables_102
+  - :ci_pipelines
+  - :ci_stages
   - :ci_stages_102
   - :deployments
   - :description_versions
@@ -35,28 +35,36 @@ Migration/UpdateLargeTable:
   - :note_diff_files
   - :notes
   - :oauth_access_tokens
+  - :packages_package_files
   - :project_authorizations
   - :push_event_payloads
   - :resource_label_events
+  - :sbom_occurrences
   - :security_findings
   - :sent_notifications
   - :system_note_metadata
+  - :taggings
   - :todos
   - :vulnerability_finding_links
   - :vulnerability_occurrences
   - :vulnerability_reads
   - :web_hook_logs
-  LargeTables:
-  - :ci_job_artifact_states
-  - :ci_pipeline_messages
+  LargeTables: &1
+  - :approval_merge_request_rules
   - :approval_merge_request_rules_users
   - :audit_events
+  - :authentication_events
+  - :ci_job_artifact_states
+  - :ci_pipeline_messages
+  - :namespaces
   - :packages_package_files
   - :personal_access_tokens
   - :projects
   - :sbom_occurrences
   - :security_scans
+  - :uploads
   - :vulnerabilities
+  - :zoekt_repositories
   HighTrafficTables:
   - :alert_management_alerts
   - :approvals
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 996ae882443..118c427fca3 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -268,7 +268,7 @@ RSpec.describe 'Database schema',
     {
       approval_merge_request_rules: 17,
       ci_builds: 27,
-      ci_pipelines: 24,
+      ci_pipelines: 25, # TODO: will change it back to 24 when duplicated index is removed
       ci_runners: 16,
       ci_runners_archived: 17,
       deployments: 18,
@@ -281,7 +281,7 @@ RSpec.describe 'Database schema',
       merge_requests: 33,
       namespaces: 26,
       p_ci_builds: 27,
-      p_ci_pipelines: 24,
+      p_ci_pipelines: 25, # TODO: will change it back to 24 when duplicated index is removed
       packages_package_files: 16,
       packages_packages: 27,
       project_type_ci_runners: 17,
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index 56f378cc44b..70994b62893 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -128,6 +128,7 @@ FactoryBot.define do
 
       after(:create) do |runner, evaluator|
         runner.runner_projects.delete_all
+        runner.clear_memoization(:owner)
       end
     end
 
diff --git a/spec/features/merge_requests/user_filters_by_source_branch_spec.rb b/spec/features/merge_requests/user_filters_by_source_branch_spec.rb
index 1b23fa290a3..3d046870ab2 100644
--- a/spec/features/merge_requests/user_filters_by_source_branch_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_source_branch_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe 'Merge Requests > User filters by source branch', :js, feature_ca
 
   context 'when filtering by source-branch:source1' do
     it 'applies the filter' do
-      select_tokens 'Source Branch', 'source1', search_token: true, submit: true
+      select_tokens 'Source branch', 'source1', search_token: true, submit: true
 
       expect(page).to have_issuable_counts(open: 1, merged: 1, closed: 1, all: 3)
       expect(page).to have_content mr1.title
@@ -37,7 +37,7 @@ RSpec.describe 'Merge Requests > User filters by source branch', :js, feature_ca
 
   context 'when filtering by source-branch:source2' do
     it 'applies the filter' do
-      select_tokens 'Source Branch', 'source2', search_token: true, submit: true
+      select_tokens 'Source branch', 'source2', search_token: true, submit: true
 
       expect(page).to have_issuable_counts(open: 1, merged: 0, closed: 0, all: 1)
       expect(page).not_to have_content mr1.title
diff --git a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
index b18a30aa083..79e020483de 100644
--- a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'Merge Requests > User filters by target branch', :js, feature_ca
 
   context 'filtering by target-branch:master' do
     it 'applies the filter' do
-      select_tokens 'Target Branch', 'master', search_token: true, submit: true
+      select_tokens 'Target branch', 'master', search_token: true, submit: true
 
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).to have_content mr1.title
@@ -27,7 +27,7 @@ RSpec.describe 'Merge Requests > User filters by target branch', :js, feature_ca
 
   context 'filtering by target-branch:merged-target' do
     it 'applies the filter' do
-      select_tokens 'Target Branch', 'merged-target', search_token: true, submit: true
+      select_tokens 'Target branch', 'merged-target', search_token: true, submit: true
 
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).not_to have_content mr1.title
diff --git a/spec/frontend/issues/show/components/task_list_item_actions_spec.js b/spec/frontend/issues/show/components/task_list_item_actions_spec.js
index 6a6a31b440d..a85d1cb009d 100644
--- a/spec/frontend/issues/show/components/task_list_item_actions_spec.js
+++ b/spec/frontend/issues/show/components/task_list_item_actions_spec.js
@@ -4,7 +4,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants';
 import TaskListItemActions from '~/issues/show/components/task_list_item_actions.vue';
 import eventHub from '~/issues/show/event_hub';
-import { WORK_ITEM_TYPE_VALUE_EPIC, WORK_ITEM_TYPE_VALUE_TASK } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_NAME_EPIC, WORK_ITEM_TYPE_NAME_TASK } from '~/work_items/constants';
 
 jest.mock('~/issues/show/event_hub');
 
@@ -45,11 +45,11 @@ describe('TaskListItemActions component', () => {
 
   describe('"Convert to child item" dropdown item', () => {
     describe.each`
-      issuableType                 | exists
-      ${TYPE_INCIDENT}             | ${true}
-      ${TYPE_ISSUE}                | ${true}
-      ${WORK_ITEM_TYPE_VALUE_EPIC} | ${true}
-      ${WORK_ITEM_TYPE_VALUE_TASK} | ${false}
+      issuableType                | exists
+      ${TYPE_INCIDENT}            | ${true}
+      ${TYPE_ISSUE}               | ${true}
+      ${WORK_ITEM_TYPE_NAME_EPIC} | ${true}
+      ${WORK_ITEM_TYPE_NAME_TASK} | ${false}
     `(`when $issuableType`, ({ issuableType, exists }) => {
       it(`${exists ? 'renders' : 'does not render'}`, () => {
         mountComponent({ issuableType });
diff --git a/spec/frontend/pipeline_wizard/templates/pages_spec.js b/spec/frontend/pipeline_wizard/templates/pages_spec.js
index 72b3b1ca852..6b05d73f23c 100644
--- a/spec/frontend/pipeline_wizard/templates/pages_spec.js
+++ b/spec/frontend/pipeline_wizard/templates/pages_spec.js
@@ -38,12 +38,12 @@ describe('Pages Template', () => {
             target: VAR_BUILD_IMAGE,
           }),
           expect.objectContaining({
-            widget: 'checklist',
-            items: [
-              expect.objectContaining({
-                text: 'The application files are in the `public` folder',
-              }),
-            ],
+            default: 'public',
+            description: 'Enter a project directory to publish. The default is "public".',
+            label: 'Choose a directory to publish',
+            monospace: true,
+            target: '$DIRECTORY',
+            widget: 'text',
           }),
         ],
         template: expect.stringContaining(VAR_BUILD_IMAGE),
@@ -75,18 +75,17 @@ describe('Pages Template', () => {
     expect(fullTemplate.toString()).toEqual(
       `# The Docker image that will be used to build your app
 image: ${VAR_BUILD_IMAGE}
-# Functions that should be executed before the build script is run
-before_script: ${VAR_INSTALLATION_STEPS}
-pages:
-  script: ${VAR_BUILD_STEPS}
-  artifacts:
-    paths:
-      # The folder that contains the files to be exposed at the Page URL
-      - public
+create-pages:
+  pages:
+    # The folder that contains the files to be exposed at the Page URL
+    publish: $DIRECTORY
   rules:
     # This ensures that only pushes to the default branch will trigger
     # a pages deploy
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+  # Functions that should be executed before the build script is run
+  before_script: ${VAR_INSTALLATION_STEPS}
+  script: ${VAR_BUILD_STEPS}
 `,
     );
   });
diff --git a/spec/frontend/repository/components/header_area/blob_repository_actions_group_spec.js b/spec/frontend/repository/components/header_area/blob_repository_actions_group_spec.js
index 881f1d6ba17..877e5fb76fb 100644
--- a/spec/frontend/repository/components/header_area/blob_repository_actions_group_spec.js
+++ b/spec/frontend/repository/components/header_area/blob_repository_actions_group_spec.js
@@ -1,16 +1,10 @@
-import { nextTick } from 'vue';
 import { GlDisclosureDropdownGroup } from '@gitlab/ui';
 import BlobRepositoryActionsGroup from '~/repository/components/header_area/blob_repository_actions_group.vue';
+import PermalinkDropdownItem from '~/repository/components/header_area/permalink_dropdown_item.vue';
 import { useMockInternalEventsTracking } from 'helpers/tracking_internal_events_helper';
 import Shortcuts from '~/behaviors/shortcuts/shortcuts';
-import {
-  keysFor,
-  PROJECT_FILES_GO_TO_PERMALINK,
-  START_SEARCH_PROJECT_FILE,
-} from '~/behaviors/shortcuts/keybindings';
+import { keysFor, START_SEARCH_PROJECT_FILE } from '~/behaviors/shortcuts/keybindings';
 import { shouldDisableShortcuts } from '~/behaviors/shortcuts/shortcuts_toggle';
-import { Mousetrap } from '~/lib/mousetrap';
-import { lineState } from '~/blob/state';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { blobControlsDataMock } from 'ee_else_ce_jest/repository/mock_data';
 
@@ -23,10 +17,6 @@ const relativePermalinkPath =
 describe('BlobRepositoryActionsGroup', () => {
   let wrapper;
 
-  const $toast = {
-    show: jest.fn(),
-  };
-
   const createComponent = (provided = {}) => {
     wrapper = shallowMountExtended(BlobRepositoryActionsGroup, {
       propsData: {
@@ -38,19 +28,18 @@ describe('BlobRepositoryActionsGroup', () => {
       },
       stubs: {
         GlDisclosureDropdownGroup,
+        PermalinkDropdownItem,
       },
-      mocks: { $toast },
     });
   };
 
   const findDropdownGroup = () => wrapper.findComponent(GlDisclosureDropdownGroup);
   const findFindFileDropdownItem = () => wrapper.findByTestId('find');
   const findBlameDropdownItem = () => wrapper.findByTestId('blame-dropdown-item');
-  const findPermalinkLinkDropdown = () => wrapper.findByTestId('permalink');
+  const findPermalinkLinkDropdown = () => wrapper.findComponent(PermalinkDropdownItem);
   const { bindInternalEventDocument } = useMockInternalEventsTracking();
 
   beforeEach(() => {
-    lineState.currentLineNumber = null;
     createComponent();
   });
 
@@ -101,56 +90,6 @@ describe('BlobRepositoryActionsGroup', () => {
     });
   });
 
-  describe('updatedPermalinkPath', () => {
-    it('returns absolutePermalinkPath when no line number is set', () => {
-      expect(findPermalinkLinkDropdown().attributes('data-clipboard-text')).toBe(
-        'http://test.host/flightjs/Flight/-/blob/46ca9ebd5a43ec240ee8d64e2bb829169dff744e/bower.json',
-      );
-    });
-
-    it('returns updated path with line number when set', () => {
-      lineState.currentLineNumber = '10';
-      createComponent();
-
-      expect(findPermalinkLinkDropdown().attributes('data-clipboard-text')).toBe(
-        `http://test.host/flightjs/Flight/-/blob/46ca9ebd5a43ec240ee8d64e2bb829169dff744e/bower.json#L10`,
-      );
-    });
-  });
-
-  describe('handles onCopyPermalink correctly', () => {
-    it('shows toast when dropdown item is clicked', () => {
-      findPermalinkLinkDropdown().vm.$emit('action');
-      expect($toast.show).toHaveBeenCalledWith('Permalink copied to clipboard.');
-    });
-
-    it('triggers copy permalink when shortcut is used', async () => {
-      const clickSpy = jest.spyOn(findPermalinkLinkDropdown().element, 'click');
-
-      Mousetrap.trigger('y');
-      await nextTick();
-
-      expect(clickSpy).toHaveBeenCalled();
-      expect($toast.show).toHaveBeenCalledWith('Permalink copied to clipboard.');
-    });
-  });
-
-  describe('lifecycle hooks', () => {
-    it('binds and unbinds Mousetrap shortcuts', () => {
-      const bindSpy = jest.spyOn(Mousetrap, 'bind');
-      const unbindSpy = jest.spyOn(Mousetrap, 'unbind');
-
-      createComponent();
-      expect(bindSpy).toHaveBeenCalledWith(
-        keysFor(PROJECT_FILES_GO_TO_PERMALINK),
-        expect.any(Function),
-      );
-
-      wrapper.destroy();
-      expect(unbindSpy).toHaveBeenCalledWith(keysFor(PROJECT_FILES_GO_TO_PERMALINK));
-    });
-  });
-
   it('displays the shortcut key when shortcuts are not disabled', () => {
     shouldDisableShortcuts.mockReturnValue(false);
     createComponent();
@@ -158,16 +97,11 @@ describe('BlobRepositoryActionsGroup', () => {
     expect(findFindFileDropdownItem().find('kbd').text()).toBe(
       keysFor(START_SEARCH_PROJECT_FILE)[0],
     );
-    expect(findPermalinkLinkDropdown().find('kbd').exists()).toBe(true);
-    expect(findPermalinkLinkDropdown().find('kbd').text()).toBe(
-      keysFor(PROJECT_FILES_GO_TO_PERMALINK)[0],
-    );
   });
 
   it('does not display the shortcut key when shortcuts are disabled', () => {
     shouldDisableShortcuts.mockReturnValue(true);
     createComponent();
     expect(findFindFileDropdownItem().find('kbd').exists()).toBe(false);
-    expect(findPermalinkLinkDropdown().find('kbd').exists()).toBe(false);
   });
 });
diff --git a/spec/frontend/repository/components/header_area/permalink_dropdown_item_spec.js b/spec/frontend/repository/components/header_area/permalink_dropdown_item_spec.js
new file mode 100644
index 00000000000..2b079eadd1a
--- /dev/null
+++ b/spec/frontend/repository/components/header_area/permalink_dropdown_item_spec.js
@@ -0,0 +1,110 @@
+import { nextTick } from 'vue';
+import { GlDisclosureDropdownItem } from '@gitlab/ui';
+import PermalinkDropdownItem from '~/repository/components/header_area/permalink_dropdown_item.vue';
+import { keysFor, PROJECT_FILES_GO_TO_PERMALINK } from '~/behaviors/shortcuts/keybindings';
+import { shouldDisableShortcuts } from '~/behaviors/shortcuts/shortcuts_toggle';
+import { Mousetrap } from '~/lib/mousetrap';
+import { lineState } from '~/blob/state';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+
+jest.mock('~/behaviors/shortcuts/shortcuts_toggle');
+jest.mock('~/blob/state');
+
+const relativePermalinkPath =
+  'flightjs/Flight/-/blob/46ca9ebd5a43ec240ee8d64e2bb829169dff744e/bower.json';
+
+describe('PermalinkDropdownItem', () => {
+  let wrapper;
+
+  const mockToastShow = jest.fn();
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMountExtended(PermalinkDropdownItem, {
+      propsData: {
+        permalinkPath: relativePermalinkPath,
+        ...props,
+      },
+      mocks: {
+        $toast: {
+          show: mockToastShow,
+        },
+      },
+    });
+  };
+
+  const findPermalinkLinkDropdown = () => wrapper.findComponent(GlDisclosureDropdownItem);
+
+  beforeEach(() => {
+    lineState.currentLineNumber = null;
+    createComponent();
+  });
+
+  it('renders correctly', () => {
+    expect(findPermalinkLinkDropdown().exists()).toBe(true);
+  });
+
+  describe('updatedPermalinkPath', () => {
+    it('returns absolutePermalinkPath when no line number is set', () => {
+      expect(findPermalinkLinkDropdown().attributes('data-clipboard-text')).toBe(
+        'http://test.host/flightjs/Flight/-/blob/46ca9ebd5a43ec240ee8d64e2bb829169dff744e/bower.json',
+      );
+    });
+
+    it('returns updated path with line number when set', () => {
+      lineState.currentLineNumber = '10';
+      createComponent();
+
+      expect(findPermalinkLinkDropdown().attributes('data-clipboard-text')).toBe(
+        `http://test.host/flightjs/Flight/-/blob/46ca9ebd5a43ec240ee8d64e2bb829169dff744e/bower.json#L10`,
+      );
+    });
+  });
+
+  describe('handles onCopyPermalink correctly', () => {
+    it('shows toast when dropdown item is clicked', async () => {
+      findPermalinkLinkDropdown().vm.$emit('action');
+      await nextTick();
+
+      expect(mockToastShow).toHaveBeenCalledWith('Permalink copied to clipboard.');
+    });
+
+    it('triggers copy permalink when shortcut is used', async () => {
+      const clickSpy = jest.spyOn(findPermalinkLinkDropdown().element, 'click');
+
+      Mousetrap.trigger('y');
+      await nextTick();
+
+      expect(clickSpy).toHaveBeenCalled();
+      expect(mockToastShow).toHaveBeenCalledWith('Permalink copied to clipboard.');
+    });
+  });
+
+  describe('lifecycle hooks', () => {
+    it('binds and unbinds Mousetrap shortcuts', () => {
+      const bindSpy = jest.spyOn(Mousetrap, 'bind');
+      const unbindSpy = jest.spyOn(Mousetrap, 'unbind');
+
+      createComponent();
+      expect(bindSpy).toHaveBeenCalledWith(
+        keysFor(PROJECT_FILES_GO_TO_PERMALINK),
+        expect.any(Function),
+      );
+
+      wrapper.destroy();
+      expect(unbindSpy).toHaveBeenCalledWith(keysFor(PROJECT_FILES_GO_TO_PERMALINK));
+    });
+  });
+
+  it('displays the shortcut key when shortcuts are not disabled', () => {
+    shouldDisableShortcuts.mockReturnValue(false);
+    createComponent();
+    expect(wrapper.find('kbd').exists()).toBe(true);
+    expect(wrapper.find('kbd').text()).toBe(keysFor(PROJECT_FILES_GO_TO_PERMALINK)[0]);
+  });
+
+  it('does not display the shortcut key when shortcuts are disabled', () => {
+    shouldDisableShortcuts.mockReturnValue(true);
+    createComponent();
+    expect(wrapper.find('kbd').exists()).toBe(false);
+  });
+});
diff --git a/spec/frontend/search/results/components/blob_header_spec.js b/spec/frontend/search/results/components/blob_header_spec.js
index 46962d2e677..79954710281 100644
--- a/spec/frontend/search/results/components/blob_header_spec.js
+++ b/spec/frontend/search/results/components/blob_header_spec.js
@@ -16,10 +16,10 @@ describe('BlobHeader', () => {
   const { bindInternalEventDocument } = useMockInternalEventsTracking();
   let wrapper;
 
-  const createComponent = (props) => {
+  const createComponent = (props, { query } = { query: MOCK_QUERY }) => {
     const store = new Vuex.Store({
       state: {
-        query: MOCK_QUERY,
+        query,
       },
     });
 
@@ -50,12 +50,33 @@ describe('BlobHeader', () => {
     it(`renders all parts of header`, () => {
       expect(findClipboardButton().exists()).toBe(true);
       expect(findFileIcon().exists()).toBe(true);
-      expect(findProjectPath().exists()).toBe(true);
+      expect(findProjectPath().props('href')).toBe('Testjs/Test');
       expect(findProjectName().exists()).toBe(true);
     });
   });
 
-  describe('limited component', () => {
+  describe('when there is project filter selected', () => {
+    beforeEach(() => {
+      createComponent(
+        {
+          filePath: 'test/file.js',
+          projectPath: 'Testjs/Test',
+          fileUrl: 'https://gitlab.com/test/file.js',
+          systemColorScheme: 'gl-light',
+        },
+        { query: { ...MOCK_QUERY, project_id: 33 } },
+      );
+    });
+
+    it(`renders without projectPath`, () => {
+      expect(findClipboardButton().exists()).toBe(true);
+      expect(findFileIcon().exists()).toBe(true);
+      expect(findProjectPath().exists()).toBe(false);
+      expect(findProjectName().exists()).toBe(true);
+    });
+  });
+
+  describe('when there is no project path', () => {
     beforeEach(() => {
       createComponent({
         filePath: 'test/file.js',
diff --git a/spec/frontend/work_items/components/create_work_item_spec.js b/spec/frontend/work_items/components/create_work_item_spec.js
index b44c4785774..864b54ff4c5 100644
--- a/spec/frontend/work_items/components/create_work_item_spec.js
+++ b/spec/frontend/work_items/components/create_work_item_spec.js
@@ -21,10 +21,10 @@ import {
   WORK_ITEM_TYPE_ENUM_EPIC,
   WORK_ITEM_TYPE_ENUM_ISSUE,
   WORK_ITEM_TYPE_ENUM_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_ISSUE,
   WORK_ITEM_TYPE_VALUE_MAP,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_TASK,
   WORK_ITEMS_TYPE_MAP,
 } from '~/work_items/constants';
 import { setNewWorkItemCache } from '~/work_items/graphql/cache_utils';
@@ -286,9 +286,9 @@ describe('Create work item component', () => {
 
     it('restricts the type selector to types provided by allowedWorkItemTypes', async () => {
       const allowedWorkItemTypes = [
-        WORK_ITEM_TYPE_VALUE_INCIDENT,
-        WORK_ITEM_TYPE_VALUE_ISSUE,
-        WORK_ITEM_TYPE_VALUE_TASK,
+        WORK_ITEM_TYPE_NAME_INCIDENT,
+        WORK_ITEM_TYPE_NAME_ISSUE,
+        WORK_ITEM_TYPE_NAME_TASK,
       ];
       createComponent({ props: { workItemTypeName: null, allowedWorkItemTypes } });
       await waitForPromises();
diff --git a/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js b/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
index 769db0f0869..2d710be515d 100644
--- a/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
+++ b/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
@@ -10,7 +10,7 @@ import { createAlert } from '~/alert';
 import RichTimestampTooltip from '~/work_items/components/rich_timestamp_tooltip.vue';
 import WorkItemStateBadge from '~/work_items/components/work_item_state_badge.vue';
 import WorkItemLinkChildContents from '~/work_items/components/shared/work_item_link_child_contents.vue';
-import { WORK_ITEM_TYPE_VALUE_OBJECTIVE } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_NAME_OBJECTIVE } from '~/work_items/constants';
 import WorkItemRelationshipIcons from '~/work_items/components/shared/work_item_relationship_icons.vue';
 
 import {
@@ -201,7 +201,7 @@ describe('WorkItemLinkChildContents', () => {
     it('renders item metadata component when item has metadata present', () => {
       createComponent({
         childItem: workItemObjectiveWithoutChild,
-        workItemType: WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+        workItemType: WORK_ITEM_TYPE_NAME_OBJECTIVE,
       });
 
       expect(findMetadataComponent().props()).toMatchObject({
diff --git a/spec/frontend/work_items/components/work_item_actions_spec.js b/spec/frontend/work_items/components/work_item_actions_spec.js
index ca1eb2f956f..8401385d8d2 100644
--- a/spec/frontend/work_items/components/work_item_actions_spec.js
+++ b/spec/frontend/work_items/components/work_item_actions_spec.js
@@ -19,11 +19,11 @@ import WorkItemChangeTypeModal from 'ee_else_ce/work_items/components/work_item_
 import MoveWorkItemModal from '~/work_items/components/move_work_item_modal.vue';
 import {
   STATE_OPEN,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
-  WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_ISSUE,
+  WORK_ITEM_TYPE_NAME_KEY_RESULT,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_TASK,
 } from '~/work_items/constants';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
 import updateWorkItemNotificationsMutation from '~/work_items/graphql/update_work_item_notifications.mutation.graphql';
@@ -623,9 +623,9 @@ describe('WorkItemActions component', () => {
         createComponent({ hasOkrsFeature: false, okrsMvc: false });
 
         expect(findCreateWorkItemModal().props('allowedWorkItemTypes')).toEqual([
-          WORK_ITEM_TYPE_VALUE_INCIDENT,
-          WORK_ITEM_TYPE_VALUE_ISSUE,
-          WORK_ITEM_TYPE_VALUE_TASK,
+          WORK_ITEM_TYPE_NAME_INCIDENT,
+          WORK_ITEM_TYPE_NAME_ISSUE,
+          WORK_ITEM_TYPE_NAME_TASK,
         ]);
       });
     });
@@ -635,11 +635,11 @@ describe('WorkItemActions component', () => {
         createComponent({ hasOkrsFeature: true, okrsMvc: true });
 
         expect(findCreateWorkItemModal().props('allowedWorkItemTypes')).toEqual([
-          WORK_ITEM_TYPE_VALUE_INCIDENT,
-          WORK_ITEM_TYPE_VALUE_ISSUE,
-          WORK_ITEM_TYPE_VALUE_TASK,
-          WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-          WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+          WORK_ITEM_TYPE_NAME_INCIDENT,
+          WORK_ITEM_TYPE_NAME_ISSUE,
+          WORK_ITEM_TYPE_NAME_TASK,
+          WORK_ITEM_TYPE_NAME_KEY_RESULT,
+          WORK_ITEM_TYPE_NAME_OBJECTIVE,
         ]);
       });
     });
@@ -739,7 +739,7 @@ describe('WorkItemActions component', () => {
   describe('move issue button', () => {
     it('shows move button when workItemType is issue and `canMove` is true', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
       });
       await waitForPromises();
 
@@ -748,7 +748,7 @@ describe('WorkItemActions component', () => {
 
     it('renders with text "Move"', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
       });
 
       await waitForPromises();
@@ -758,7 +758,7 @@ describe('WorkItemActions component', () => {
 
     it('hides move button when `canMove` is false', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         canMove: false,
       });
       await waitForPromises();
@@ -768,7 +768,7 @@ describe('WorkItemActions component', () => {
 
     it('hides move button when workItemType is not issue', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_TASK,
+        workItemType: WORK_ITEM_TYPE_NAME_TASK,
       });
 
       await waitForPromises();
@@ -780,7 +780,7 @@ describe('WorkItemActions component', () => {
   describe('move modal', () => {
     it('does not render move modal when there is no projectId', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         projectId: null,
       });
 
@@ -791,7 +791,7 @@ describe('WorkItemActions component', () => {
 
     it('renders move modal when move button is clicked', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
       });
 
       await waitForPromises();
@@ -805,7 +805,7 @@ describe('WorkItemActions component', () => {
 
     it('passes correct props to move modal', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
       });
 
       await waitForPromises();
@@ -823,7 +823,7 @@ describe('WorkItemActions component', () => {
 
     it('closes modal when hideModal event is emitted', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
       });
 
       await waitForPromises();
diff --git a/spec/frontend/work_items/components/work_item_change_type_modal_spec.js b/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
index 0b57443324e..dfde48e79fa 100644
--- a/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
+++ b/spec/frontend/work_items/components/work_item_change_type_modal_spec.js
@@ -13,8 +13,8 @@ import namespaceWorkItemTypesQuery from '~/work_items/graphql/namespace_work_ite
 import convertWorkItemMutation from '~/work_items/graphql/work_item_convert.mutation.graphql';
 import getWorkItemDesignListQuery from '~/work_items/components/design_management/graphql/design_collection.query.graphql';
 import {
-  WORK_ITEM_TYPE_VALUE_TASK,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_TASK,
+  WORK_ITEM_TYPE_NAME_ISSUE,
   WORK_ITEM_TYPE_ENUM_EPIC,
 } from '~/work_items/constants';
 
@@ -32,16 +32,16 @@ describe('WorkItemChangeTypeModal component', () => {
 
   const typesQuerySuccessHandler = jest.fn().mockResolvedValue(namespaceWorkItemTypesQueryResponse);
   const issueTypeId = namespaceWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
-    (type) => type.name === WORK_ITEM_TYPE_VALUE_ISSUE,
+    (type) => type.name === WORK_ITEM_TYPE_NAME_ISSUE,
   ).id;
   const taskTypeId = namespaceWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
-    (type) => type.name === WORK_ITEM_TYPE_VALUE_TASK,
+    (type) => type.name === WORK_ITEM_TYPE_NAME_TASK,
   ).id;
   namespaceWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes
-    .find((item) => item.name === WORK_ITEM_TYPE_VALUE_TASK)
+    .find((item) => item.name === WORK_ITEM_TYPE_NAME_TASK)
     .widgetDefinitions.splice(
       namespaceWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes
-        .find((item) => item.name === WORK_ITEM_TYPE_VALUE_TASK)
+        .find((item) => item.name === WORK_ITEM_TYPE_NAME_TASK)
         .widgetDefinitions.findIndex((item) => item.type === 'CRM_CONTACTS'),
       1,
     );
@@ -70,7 +70,7 @@ describe('WorkItemChangeTypeModal component', () => {
     hasChildren = false,
     workItemsAlpha = false,
     widgets = [],
-    workItemType = WORK_ITEM_TYPE_VALUE_TASK,
+    workItemType = WORK_ITEM_TYPE_NAME_TASK,
     convertWorkItemMutationHandler = convertWorkItemMutationSuccessHandler,
     designQueryHandler = noDesignQueryHandler,
     allowedWorkItemTypesEE = [],
@@ -89,7 +89,7 @@ describe('WorkItemChangeTypeModal component', () => {
         hasChildren,
         widgets,
         workItemType,
-        allowedChildTypes: [{ name: WORK_ITEM_TYPE_VALUE_TASK }],
+        allowedChildTypes: [{ name: WORK_ITEM_TYPE_NAME_TASK }],
         allowedWorkItemTypesEE,
       },
       provide: {
@@ -154,7 +154,7 @@ describe('WorkItemChangeTypeModal component', () => {
   });
 
   it('does not allow to change type and disables `Change type` button when the work item has child items', async () => {
-    createComponent({ workItemType: WORK_ITEM_TYPE_VALUE_ISSUE, hasChildren: true });
+    createComponent({ workItemType: WORK_ITEM_TYPE_NAME_ISSUE, hasChildren: true });
 
     await waitForPromises();
 
@@ -171,7 +171,7 @@ describe('WorkItemChangeTypeModal component', () => {
   describe('when widget data has difference', () => {
     it('shows warning message in case of designs', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         designQueryHandler: oneDesignQueryHandler,
       });
 
@@ -187,7 +187,7 @@ describe('WorkItemChangeTypeModal component', () => {
 
     it('shows warning message in case of Contacts widget', async () => {
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         widgets: [workItemChangeTypeWidgets.CRM_CONTACTS],
       });
 
@@ -209,7 +209,7 @@ describe('WorkItemChangeTypeModal component', () => {
         },
       ];
       createComponent({
-        workItemType: WORK_ITEM_TYPE_VALUE_ISSUE,
+        workItemType: WORK_ITEM_TYPE_NAME_ISSUE,
         widgets: [workItemChangeTypeWidgets.MILESTONE],
         workItemsAlpha: true,
         allowedWorkItemTypesEE,
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_link_child_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_link_child_spec.js
index e9196a98941..f6d01308635 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_link_child_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_link_child_spec.js
@@ -13,10 +13,10 @@ import WorkItemChildrenWrapper from '~/work_items/components/work_item_links/wor
 import WorkItemLinkChildContents from '~/work_items/components/shared/work_item_link_child_contents.vue';
 import {
   WIDGET_TYPE_HIERARCHY,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_TASK,
   DEFAULT_PAGE_SIZE_CHILD_ITEMS,
-  WORK_ITEM_TYPE_VALUE_EPIC,
+  WORK_ITEM_TYPE_NAME_EPIC,
 } from '~/work_items/constants';
 
 import {
@@ -60,7 +60,7 @@ describe('WorkItemLinkChild', () => {
     canUpdate = true,
     issuableGid = WORK_ITEM_ID,
     childItem = workItemObjectiveWithChild,
-    workItemType = WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+    workItemType = WORK_ITEM_TYPE_NAME_OBJECTIVE,
     workItemTreeQueryHandler = getWorkItemTreeQueryHandler,
     isExpanded = false,
     showTaskWeight = false,
@@ -158,7 +158,7 @@ describe('WorkItemLinkChild', () => {
 
   describe('without children', () => {
     beforeEach(() => {
-      createComponent({ childItem: workItemTask, workItemType: WORK_ITEM_TYPE_VALUE_TASK });
+      createComponent({ childItem: workItemTask, workItemType: WORK_ITEM_TYPE_NAME_TASK });
     });
 
     it('does not display expand button', () => {
@@ -231,13 +231,13 @@ describe('WorkItemLinkChild', () => {
       });
 
       it.each`
-        workItemType                      | childItem                     | showTaskWeight | showWeight
-        ${WORK_ITEM_TYPE_VALUE_TASK}      | ${workItemTask}               | ${false}       | ${false}
-        ${WORK_ITEM_TYPE_VALUE_TASK}      | ${workItemTask}               | ${true}        | ${true}
-        ${WORK_ITEM_TYPE_VALUE_OBJECTIVE} | ${workItemObjectiveWithChild} | ${false}       | ${true}
-        ${WORK_ITEM_TYPE_VALUE_OBJECTIVE} | ${workItemObjectiveWithChild} | ${true}        | ${true}
-        ${WORK_ITEM_TYPE_VALUE_OBJECTIVE} | ${workItemObjectiveWithChild} | ${false}       | ${true}
-        ${WORK_ITEM_TYPE_VALUE_EPIC}      | ${workItemEpic}               | ${true}        | ${true}
+        workItemType                     | childItem                     | showTaskWeight | showWeight
+        ${WORK_ITEM_TYPE_NAME_TASK}      | ${workItemTask}               | ${false}       | ${false}
+        ${WORK_ITEM_TYPE_NAME_TASK}      | ${workItemTask}               | ${true}        | ${true}
+        ${WORK_ITEM_TYPE_NAME_OBJECTIVE} | ${workItemObjectiveWithChild} | ${false}       | ${true}
+        ${WORK_ITEM_TYPE_NAME_OBJECTIVE} | ${workItemObjectiveWithChild} | ${true}        | ${true}
+        ${WORK_ITEM_TYPE_NAME_OBJECTIVE} | ${workItemObjectiveWithChild} | ${false}       | ${true}
+        ${WORK_ITEM_TYPE_NAME_EPIC}      | ${workItemEpic}               | ${true}        | ${true}
       `(
         'passes `showWeight` as $showWeight when the type is $workItemType and `showTaskWeight` is $showWeight',
         ({ childItem, showWeight }) => {
@@ -256,7 +256,7 @@ describe('WorkItemLinkChild', () => {
         workItemTreeQueryHandler: jest
           .fn()
           .mockRejectedValue(workItemHierarchyTreeSingleClosedItemResponse),
-        workItemType: WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+        workItemType: WORK_ITEM_TYPE_NAME_OBJECTIVE,
         isExpanded: true,
       });
       await findExpandButton().vm.$emit('click', { stopPropagation: jest.fn() });
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
index 15bac68f2fb..adff338fe47 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_form_spec.js
@@ -15,8 +15,8 @@ import {
   FORM_TYPES,
   WORK_ITEM_TYPE_ENUM_TASK,
   WORK_ITEM_TYPE_ENUM_ISSUE,
-  WORK_ITEM_TYPE_VALUE_EPIC,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
+  WORK_ITEM_TYPE_NAME_EPIC,
+  WORK_ITEM_TYPE_NAME_ISSUE,
   SEARCH_DEBOUNCE,
   WORK_ITEM_TYPE_ENUM_EPIC,
   MAX_WORK_ITEMS,
@@ -72,7 +72,7 @@ describe('WorkItemLinksForm', () => {
     parentIteration = null,
     parentMilestone = null,
     formType = FORM_TYPES.create,
-    parentWorkItemType = WORK_ITEM_TYPE_VALUE_ISSUE,
+    parentWorkItemType = WORK_ITEM_TYPE_NAME_ISSUE,
     childrenType = WORK_ITEM_TYPE_ENUM_TASK,
     updateMutation = updateMutationResolver,
     createMutation = createMutationResolver,
@@ -247,7 +247,7 @@ describe('WorkItemLinksForm', () => {
       beforeEach(async () => {
         await createComponent({
           isGroup: true,
-          parentWorkItemType: WORK_ITEM_TYPE_VALUE_EPIC,
+          parentWorkItemType: WORK_ITEM_TYPE_NAME_EPIC,
           childrenType: WORK_ITEM_TYPE_ENUM_ISSUE,
         });
       });
@@ -286,7 +286,7 @@ describe('WorkItemLinksForm', () => {
         await createComponent({
           parentConfidential: true,
           isGroup: true,
-          parentWorkItemType: WORK_ITEM_TYPE_VALUE_EPIC,
+          parentWorkItemType: WORK_ITEM_TYPE_NAME_EPIC,
           childrenType: WORK_ITEM_TYPE_ENUM_ISSUE,
         });
 
@@ -315,7 +315,7 @@ describe('WorkItemLinksForm', () => {
       beforeEach(async () => {
         await createComponent({
           isGroup: true,
-          parentWorkItemType: WORK_ITEM_TYPE_VALUE_EPIC,
+          parentWorkItemType: WORK_ITEM_TYPE_NAME_EPIC,
           childrenType: WORK_ITEM_TYPE_ENUM_EPIC,
         });
       });
@@ -362,7 +362,7 @@ describe('WorkItemLinksForm', () => {
       await createComponent({
         parentConfidential: false,
         isGroup: true,
-        parentWorkItemType: WORK_ITEM_TYPE_VALUE_EPIC,
+        parentWorkItemType: WORK_ITEM_TYPE_NAME_EPIC,
         childrenType: WORK_ITEM_TYPE_ENUM_ISSUE,
       });
 
@@ -399,7 +399,7 @@ describe('WorkItemLinksForm', () => {
       await createComponent({
         parentConfidential: false,
         isGroup: true,
-        parentWorkItemType: WORK_ITEM_TYPE_VALUE_EPIC,
+        parentWorkItemType: WORK_ITEM_TYPE_NAME_EPIC,
         childrenType: WORK_ITEM_TYPE_ENUM_ISSUE,
         createGroupLevelWorkItems: false,
       });
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_tree_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_tree_spec.js
index 479e0890c55..28544aef4cc 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_tree_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_tree_spec.js
@@ -24,9 +24,9 @@ import {
   WORK_ITEM_TYPE_ENUM_KEY_RESULT,
   WORK_ITEM_TYPE_ENUM_EPIC,
   WORK_ITEM_TYPE_ENUM_ISSUE,
-  WORK_ITEM_TYPE_VALUE_EPIC,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_TASK,
+  WORK_ITEM_TYPE_NAME_EPIC,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_TASK,
   WORKITEM_TREE_SHOWLABELS_LOCALSTORAGEKEY,
   WORKITEM_TREE_SHOWCLOSED_LOCALSTORAGEKEY,
 } from '~/work_items/constants';
@@ -138,10 +138,10 @@ describe('WorkItemTree', () => {
   });
 
   it.each`
-    workItemType                      | showTaskWeight
-    ${WORK_ITEM_TYPE_VALUE_EPIC}      | ${false}
-    ${WORK_ITEM_TYPE_VALUE_TASK}      | ${true}
-    ${WORK_ITEM_TYPE_VALUE_OBJECTIVE} | ${true}
+    workItemType                     | showTaskWeight
+    ${WORK_ITEM_TYPE_NAME_EPIC}      | ${false}
+    ${WORK_ITEM_TYPE_NAME_TASK}      | ${true}
+    ${WORK_ITEM_TYPE_NAME_OBJECTIVE} | ${true}
   `(
     'passes `showTaskWeight` as $showTaskWeight when the type is $workItemType',
     async ({ workItemType, showTaskWeight }) => {
@@ -326,8 +326,8 @@ describe('WorkItemTree', () => {
 
     it.each`
       visible | workItemType
-      ${true} | ${WORK_ITEM_TYPE_VALUE_EPIC}
-      ${true} | ${WORK_ITEM_TYPE_VALUE_OBJECTIVE}
+      ${true} | ${WORK_ITEM_TYPE_NAME_EPIC}
+      ${true} | ${WORK_ITEM_TYPE_NAME_OBJECTIVE}
     `('renders when the work item type is $workItemType', async ({ workItemType, visible }) => {
       await createComponent({ workItemType });
 
diff --git a/spec/frontend/work_items/utils_spec.js b/spec/frontend/work_items/utils_spec.js
index d3798231710..f76745769ac 100644
--- a/spec/frontend/work_items/utils_spec.js
+++ b/spec/frontend/work_items/utils_spec.js
@@ -11,15 +11,15 @@ import {
   WORK_ITEM_TYPE_ENUM_TASK,
   WORK_ITEM_TYPE_ENUM_TEST_CASE,
   WORK_ITEM_TYPE_ENUM_TICKET,
-  WORK_ITEM_TYPE_VALUE_EPIC,
-  WORK_ITEM_TYPE_VALUE_INCIDENT,
-  WORK_ITEM_TYPE_VALUE_ISSUE,
-  WORK_ITEM_TYPE_VALUE_KEY_RESULT,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
-  WORK_ITEM_TYPE_VALUE_REQUIREMENTS,
-  WORK_ITEM_TYPE_VALUE_TASK,
-  WORK_ITEM_TYPE_VALUE_TEST_CASE,
-  WORK_ITEM_TYPE_VALUE_TICKET,
+  WORK_ITEM_TYPE_NAME_EPIC,
+  WORK_ITEM_TYPE_NAME_INCIDENT,
+  WORK_ITEM_TYPE_NAME_ISSUE,
+  WORK_ITEM_TYPE_NAME_KEY_RESULT,
+  WORK_ITEM_TYPE_NAME_OBJECTIVE,
+  WORK_ITEM_TYPE_NAME_REQUIREMENTS,
+  WORK_ITEM_TYPE_NAME_TASK,
+  WORK_ITEM_TYPE_NAME_TEST_CASE,
+  WORK_ITEM_TYPE_NAME_TICKET,
 } from '~/work_items/constants';
 import {
   autocompleteDataSources,
@@ -208,16 +208,16 @@ describe('newWorkItemPath', () => {
 
 describe('convertTypeEnumToName', () => {
   it.each`
-    name                                 | enumValue
-    ${WORK_ITEM_TYPE_VALUE_EPIC}         | ${WORK_ITEM_TYPE_ENUM_EPIC}
-    ${WORK_ITEM_TYPE_VALUE_INCIDENT}     | ${WORK_ITEM_TYPE_ENUM_INCIDENT}
-    ${WORK_ITEM_TYPE_VALUE_ISSUE}        | ${WORK_ITEM_TYPE_ENUM_ISSUE}
-    ${WORK_ITEM_TYPE_VALUE_KEY_RESULT}   | ${WORK_ITEM_TYPE_ENUM_KEY_RESULT}
-    ${WORK_ITEM_TYPE_VALUE_OBJECTIVE}    | ${WORK_ITEM_TYPE_ENUM_OBJECTIVE}
-    ${WORK_ITEM_TYPE_VALUE_REQUIREMENTS} | ${WORK_ITEM_TYPE_ENUM_REQUIREMENTS}
-    ${WORK_ITEM_TYPE_VALUE_TASK}         | ${WORK_ITEM_TYPE_ENUM_TASK}
-    ${WORK_ITEM_TYPE_VALUE_TEST_CASE}    | ${WORK_ITEM_TYPE_ENUM_TEST_CASE}
-    ${WORK_ITEM_TYPE_VALUE_TICKET}       | ${WORK_ITEM_TYPE_ENUM_TICKET}
+    name                                | enumValue
+    ${WORK_ITEM_TYPE_NAME_EPIC}         | ${WORK_ITEM_TYPE_ENUM_EPIC}
+    ${WORK_ITEM_TYPE_NAME_INCIDENT}     | ${WORK_ITEM_TYPE_ENUM_INCIDENT}
+    ${WORK_ITEM_TYPE_NAME_ISSUE}        | ${WORK_ITEM_TYPE_ENUM_ISSUE}
+    ${WORK_ITEM_TYPE_NAME_KEY_RESULT}   | ${WORK_ITEM_TYPE_ENUM_KEY_RESULT}
+    ${WORK_ITEM_TYPE_NAME_OBJECTIVE}    | ${WORK_ITEM_TYPE_ENUM_OBJECTIVE}
+    ${WORK_ITEM_TYPE_NAME_REQUIREMENTS} | ${WORK_ITEM_TYPE_ENUM_REQUIREMENTS}
+    ${WORK_ITEM_TYPE_NAME_TASK}         | ${WORK_ITEM_TYPE_ENUM_TASK}
+    ${WORK_ITEM_TYPE_NAME_TEST_CASE}    | ${WORK_ITEM_TYPE_ENUM_TEST_CASE}
+    ${WORK_ITEM_TYPE_NAME_TICKET}       | ${WORK_ITEM_TYPE_ENUM_TICKET}
   `('returns %name when given the enum %enumValue', ({ name, enumValue }) => {
     expect(convertTypeEnumToName(enumValue)).toBe(name);
   });
diff --git a/spec/lib/gitlab/ci/config/yaml_spec.rb b/spec/lib/gitlab/ci/config/yaml_spec.rb
index 470ffc5911a..61505c99cff 100644
--- a/spec/lib/gitlab/ci/config/yaml_spec.rb
+++ b/spec/lib/gitlab/ci/config/yaml_spec.rb
@@ -4,99 +4,127 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Ci::Config::Yaml, feature_category: :pipeline_composition do
   describe '.load!' do
-    let(:yaml) do
-      <<~YAML
-      image: 'image:1.0'
-      texts:
-        nested_key: 'value1'
-        more_text:
-          more_nested_key: 'value2'
-      YAML
-    end
-
-    subject(:config) { described_class.load!(yaml) }
-
-    it 'loads a YAML file' do
-      expect(config).to eq({
-        image: 'image:1.0',
-        texts: {
-          nested_key: 'value1',
-          more_text: {
+    context 'with basic YAML' do
+      let(:yaml) do
+        <<~YAML
+        image: 'image:1.0'
+        texts:
+          nested_key: 'value1'
+          more_text:
             more_nested_key: 'value2'
+        YAML
+      end
+
+      subject(:config) { described_class.load!(yaml) }
+
+      it 'loads a YAML file' do
+        expect(config).to eq({
+          image: 'image:1.0',
+          texts: {
+            nested_key: 'value1',
+            more_text: {
+              more_nested_key: 'value2'
+            }
           }
-        }
-      })
-    end
+        })
+      end
 
-    context 'when YAML is invalid' do
-      let(:yaml) { 'some: invalid: syntax' }
+      context 'when YAML is invalid' do
+        let(:yaml) { 'some: invalid: syntax' }
 
-      it 'raises an error' do
-        expect { config }
-          .to raise_error ::Gitlab::Config::Loader::FormatError, /mapping values are not allowed in this context/
+        it 'raises an error' do
+          expect { config }
+            .to raise_error ::Gitlab::Config::Loader::FormatError, /mapping values are not allowed in this context/
+        end
       end
     end
-  end
 
-  describe '.load_with_inputs!' do
-    let(:yaml) do
-      <<~YAML
-      spec:
-        inputs:
-          compiler:
-            default: gcc
-          optimization_level:
-            type: number
-      ---
+    context 'with inputs and variables' do
+      let(:yaml) do
+        <<~YAML
+        spec:
+          inputs:
+            compiler:
+              default: gcc
+            optimization_level:
+              type: number
+              default: 0
+        ---
 
-      test:
-        script:
-          - echo "with compiler $[[ inputs.compiler | expand_vars ]] and level $[[ inputs.optimization_level ]]"
-      YAML
-    end
+        test:
+          script:
+            - echo "with compiler $[[ inputs.compiler | expand_vars ]] and level $[[ inputs.optimization_level ]]"
+        YAML
+      end
 
-    let(:inputs) do
-      { compiler: 'g++', optimization_level: 1 }
-    end
-
-    let(:variables) do
-      [{ key: 'COMPILER', value: 'c++' }]
-    end
-
-    subject(:config) { described_class.load_with_inputs!(yaml, inputs, variables) }
-
-    it 'loads a YAML file' do
-      expect(config).to eq(
-        test: {
-          script: ['echo "with compiler g++ and level 1"']
-        }
-      )
-    end
-
-    context 'when using a variable in the input value' do
       let(:inputs) do
-        { compiler: '$COMPILER', optimization_level: 2 }
+        { compiler: 'g++', optimization_level: 1 }
       end
 
-      it 'loads the YAML config file, expands the variable and interpolates the input(s)' do
+      let(:variables) do
+        [{ key: 'COMPILER', value: 'c++' }]
+      end
+
+      subject(:config) { described_class.load!(yaml, inputs, variables) }
+
+      it 'loads a YAML file with inputs' do
         expect(config).to eq(
           test: {
-            script: ['echo "with compiler c++ and level 2"']
+            script: ['echo "with compiler g++ and level 1"']
           }
         )
       end
-    end
 
-    context 'when given invalid input values' do
-      let(:inputs) do
-        { compiler: 5, optimization_level: 'a string' }
+      context 'when using a variable in the input value' do
+        let(:inputs) do
+          { compiler: '$COMPILER', optimization_level: 2 }
+        end
+
+        it 'loads the YAML config file, expands the variable and interpolates the input(s)' do
+          expect(config).to eq(
+            test: {
+              script: ['echo "with compiler c++ and level 2"']
+            }
+          )
+        end
       end
 
-      it 'raises error' do
-        expect { config }.to raise_error(
-          ::Gitlab::Ci::Config::Yaml::LoadError,
-          '`compiler` input: provided value is not a string, `optimization_level` input: provided value is not a number'
-        )
+      context 'when given invalid input values' do
+        let(:inputs) do
+          { compiler: 5, optimization_level: 'a string' }
+        end
+
+        it 'raises error' do
+          expect { config }.to raise_error(
+            ::Gitlab::Ci::Config::Yaml::LoadError,
+            '`compiler` input: provided value is not a string, ' \
+              '`optimization_level` input: provided value is not a number'
+          )
+        end
+      end
+
+      context 'with default parameters' do
+        subject(:config) { described_class.load!(yaml) }
+
+        it 'works with empty inputs and variables' do
+          expect(config).to eq(
+            test: {
+              script: ['echo "with compiler gcc and level 0"']
+            }
+          )
+        end
+      end
+
+      context 'with only inputs' do
+        subject(:config) { described_class.load!(yaml, { compiler: 'clang', optimization_level: 3 }) }
+
+        it 'works with only inputs parameter' do
+          expect(config).to eq(
+            test: {
+              script: ['echo "with compiler clang and level 3"']
+            }
+          )
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/database/stat_activity_spec.rb b/spec/lib/gitlab/database/stat_activity_spec.rb
index be5940dd352..3f5325d60ff 100644
--- a/spec/lib/gitlab/database/stat_activity_spec.rb
+++ b/spec/lib/gitlab/database/stat_activity_spec.rb
@@ -99,4 +99,89 @@ RSpec.describe Gitlab::Database::StatActivity,
       end
     end
   end
+
+  describe '#non_idle_connections_by_db' do
+    let(:connection_name) { :main }
+    let(:hash_key) { "gitlab:pg_stat_sampler:main:sidekiq:samples" }
+    let(:samples) do
+      [
+        {
+          'created_at' => Time.now.utc.to_i - 60,
+          'payload' => {
+            'WorkerA' => { 'active' => 1, 'idle' => 1 },
+            'WorkerB' => { 'active' => 5, 'idle in transaction' => 5 }
+          }
+        },
+        {
+          'created_at' => Time.now.utc.to_i - 45,
+          'payload' => {
+            'WorkerA' => { 'active' => 2, 'idle' => 1 },
+            'WorkerB' => { 'active' => 5, 'idle in transaction' => 5 }
+          }
+        },
+        {
+          'created_at' => Time.now.utc.to_i - 30,
+          'payload' => {
+            'WorkerA' => { 'active' => 3, 'idle' => 1 },
+            'WorkerB' => { 'active' => 5, 'idle in transaction' => 5 }
+          }
+        },
+        {
+          'created_at' => Time.now.utc.to_i - 15,
+          'payload' => {
+            'WorkerA' => { 'active' => 4, 'idle' => 1 },
+            'WorkerB' => { 'active' => 5, 'idle in transaction' => 5 },
+            'WorkerC' => { 'active' => 1 }
+          }
+        }
+      ]
+    end
+
+    subject(:non_idle_connections_by_db) do
+      described_class.new(connection_name).non_idle_connections_by_db(min_samples)
+    end
+
+    before do
+      allow(Gitlab).to receive(:process_name).and_return('sidekiq')
+      Gitlab::Redis::SharedState.with do |r|
+        r.hset(hash_key, 'gitlabhq_test', ::Gitlab::Json.dump(samples))
+      end
+    end
+
+    context 'with enough samples' do
+      let(:min_samples) { 4 }
+      let(:expected) do
+        {
+          'gitlabhq_test' => {
+            'WorkerA' => 10, # ignores idle
+            'WorkerB' => 40, # includes `idle in transaction`
+            'WorkerC' => 1
+          }
+        }
+      end
+
+      it 'returns aggregated non-idle count' do
+        expect(non_idle_connections_by_db).to eq(expected)
+      end
+    end
+
+    context 'with not enough samples' do
+      let(:min_samples) { 5 }
+      let(:expected) { { 'gitlabhq_test' => {} } }
+
+      it 'returns empty hash' do
+        expect(non_idle_connections_by_db).to eq(expected)
+      end
+    end
+
+    context 'with empty samples' do
+      let(:min_samples) { 1 }
+      let(:samples) { [] }
+      let(:expected) { { 'gitlabhq_test' => {} } }
+
+      it 'returns empty hash' do
+        expect(non_idle_connections_by_db).to eq(expected)
+      end
+    end
+  end
 end
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 92f152fd0b3..f7b1079407e 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -515,7 +515,12 @@ RSpec.describe Ci::Runner, type: :model, factory_default: :keep, feature_categor
   end
 
   describe '#assign_to' do
-    subject(:assign_to) { runner.assign_to(project) }
+    subject(:assign_to) do
+      runner.assign_to(project).tap do
+        # Ensure we're recomputing the owner value
+        runner.clear_memoization(:owner)
+      end
+    end
 
     context 'with instance runner' do
       let(:runner) { create(:ci_runner, :instance) }
@@ -540,9 +545,7 @@ RSpec.describe Ci::Runner, type: :model, factory_default: :keep, feature_categor
       let_it_be_with_reload(:fallback_owner_project) { create(:project, group: group) }
 
       let(:associated_projects) { [owner_project, fallback_owner_project] }
-      let(:runner) { create(:ci_runner, :project, projects: associated_projects, tag_list: %w[tag1 tag2]) }
-      let(:runner_manager) { create(:ci_runner_machine, runner: runner) }
-      let(:runner_taggings) { runner.taggings }
+      let(:runner) { create(:ci_runner, :project, projects: associated_projects) }
 
       it 'assigns runner to project' do
         expect(assign_to).to be_truthy
@@ -551,53 +554,41 @@ RSpec.describe Ci::Runner, type: :model, factory_default: :keep, feature_categor
         expect(runner.project_ids).to contain_exactly(project.id, owner_project.id, fallback_owner_project.id)
       end
 
-      it 'does not change sharding_key_id or owner' do
-        expect { assign_to }
-          .to not_change { runner.reload.sharding_key_id }.from(owner_project.id)
-          .and not_change { runner.owner }.from(owner_project)
-          .and not_change { runner_manager.reload.sharding_key_id }.from(owner_project.id)
-          .and not_change { runner.taggings.pluck(:sharding_key_id).uniq }.from([owner_project.id])
+      it 'does not change owner' do
+        expect { assign_to }.not_to change { runner.reload.owner }.from(owner_project)
       end
 
-      context 'when sharding_key_id does not point to an existing project' do
+      context 'when owner project does not exist' do
         subject(:assign_to) do
-          owner_project.destroy!
+          owner_project.destroy!.then do |project|
+            runner.runner_projects.where(project_id: project.id).delete_all
+            runner.reload
+            runner.clear_memoization(:owner)
+          end
 
           runner.assign_to(project)
         end
 
-        it 'changes sharding_key_id and owner to fallback owner project' do
-          expect { assign_to }
-            .to change { runner.reload.sharding_key_id }.from(owner_project.id).to(fallback_owner_project.id)
-            .and change { runner.owner }.from(owner_project).to(fallback_owner_project)
-            .and change { runner_manager.reload.sharding_key_id }.to(fallback_owner_project.id)
-            .and change { runner.taggings.pluck(:sharding_key_id).uniq }.to([fallback_owner_project.id])
+        it 'changes owner to fallback owner project' do
+          expect { assign_to }.to change { runner.owner }.from(owner_project).to(fallback_owner_project)
         end
 
         context 'and fallback does not exist' do
           let(:associated_projects) { [owner_project] }
 
-          it 'does not change sharding_key_id or owner' do
-            expect { assign_to }
-              .to not_change { runner.reload.sharding_key_id }.from(owner_project.id)
-              .and not_change { runner.owner }.from(owner_project)
-              .and not_change { runner_manager.reload.sharding_key_id }.from(owner_project.id)
-              .and not_change { runner.taggings.pluck(:sharding_key_id).uniq }.from([owner_project.id])
+          it 'changes owner to nil' do
+            expect { assign_to }.to change { runner.owner }.to(nil)
 
-            expect(runner.errors[:assign_to]).to contain_exactly('Runner is orphaned and no fallback owner exists')
+            expect(runner.errors[:assign_to]).to contain_exactly('Taking over an orphaned project runner is not allowed')
           end
         end
       end
 
       context 'when runner is not associated with any projects' do
-        let(:runner) { create(:ci_runner, :project, :without_projects, tag_list: %w[tag1 tag2]) }
+        let(:runner) { create(:ci_runner, :project, :without_projects) }
 
         it 'does not allow taking over project runner' do
-          expect { assign_to }
-            .to not_change { runner.reload.sharding_key_id }
-            .and not_change { runner.owner }
-            .and not_change { runner_manager.reload.sharding_key_id }
-            .and not_change { runner.taggings.pluck(:sharding_key_id).uniq }
+          expect { assign_to }.not_to change { runner.owner }.from(nil)
 
           expect(runner.errors[:assign_to]).to contain_exactly('Taking over an orphaned project runner is not allowed')
         end
@@ -1272,13 +1263,23 @@ RSpec.describe Ci::Runner, type: :model, factory_default: :keep, feature_categor
         context 'and owner project is deleted' do
           before do
             owner_project.destroy!
-            project_runner.clear_memoization(:owner)
           end
 
-          it { is_expected.to eq other_project }
-          it { is_expected.not_to eq projects.last }
+          it { is_expected.to eq owner_project }
+
+          it "changes when corresponding runner project is deleted" do
+            project_runner.runner_projects.where(project_id: owner_project.id).delete_all
+            project_runner.reload.clear_memoization(:owner)
+
+            expect(project_runner.owner).to eq other_project
+          end
 
           context 'and projects are associated in different order' do
+            before do
+              project_runner.runner_projects.where(project_id: owner_project.id).delete_all
+              project_runner.reload.clear_memoization(:owner)
+            end
+
             let(:associated_projects) { [owner_project, projects.last, other_project] }
 
             it 'is not sensitive to project ID order' do
@@ -1790,16 +1791,33 @@ RSpec.describe Ci::Runner, type: :model, factory_default: :keep, feature_categor
     describe '#owner' do
       subject(:owner) { runner.owner }
 
-      let_it_be_with_refind(:runner) { create(:ci_runner, :group, groups: [group]) }
+      context 'with runner assigned to group' do
+        let(:owner_group) { create(:group) }
+        let(:runner) { create(:ci_runner, :group, groups: [owner_group]) }
 
-      it { is_expected.to eq group }
+        it { is_expected.to eq owner_group }
 
-      context 'when sharding_key_id points to non-existing group' do
-        before do
-          runner.update_columns(sharding_key_id: non_existing_record_id)
+        context 'and owner group is deleted' do
+          before do
+            owner_group.destroy!
+          end
+
+          it { is_expected.to eq owner_group }
+
+          it "becomes nil when corresponding runner namespace is deleted" do
+            runner.runner_namespaces.where(namespace_id: group.id).delete_all
+            runner.clear_memoization(:owner)
+            runner.reload
+
+            is_expected.to be_nil
+          end
         end
+      end
 
-        it { is_expected.to be_nil }
+      context 'with runner assigned to child_group' do
+        let(:runner) { child_group_runner }
+
+        it { is_expected.to eq child_group }
       end
     end
   end
diff --git a/spec/requests/api/ci/runner/jobs_request_post_spec.rb b/spec/requests/api/ci/runner/jobs_request_post_spec.rb
index af5b5ab05b3..3441664feea 100644
--- a/spec/requests/api/ci/runner/jobs_request_post_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_request_post_spec.rb
@@ -1197,7 +1197,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state, feature_catego
               let(:expected_params) { { root_namespace: group.full_path_components.first, client_id: "runner/#{runner.id}" } }
             end
 
-            it_behaves_like 'not executing any extra queries for the application context', 2 do
+            it_behaves_like 'not executing any extra queries for the application context', 3 do
               # Extra queries: Group, Route
               let(:subject_proc) { proc { request_job } }
             end
diff --git a/spec/services/ci/partitions/create_service_spec.rb b/spec/services/ci/partitions/create_service_spec.rb
index 8e19fcad7c7..7618488dd57 100644
--- a/spec/services/ci/partitions/create_service_spec.rb
+++ b/spec/services/ci/partitions/create_service_spec.rb
@@ -59,5 +59,29 @@ RSpec.describe Ci::Partitions::CreateService, feature_category: :ci_scaling do
         it_behaves_like 'ci_partition not created'
       end
     end
+
+    context 'with default partition threshold' do
+      it 'uses partition threshold' do
+        expect(ci_partition)
+          .to receive(:above_threshold?)
+          .with(Ci::Partition::MAX_PARTITION_SIZE)
+          .and_call_original
+
+        expect { execute_service }.not_to change { Ci::Partition.count }
+      end
+    end
+
+    context 'when executed on staging' do
+      it 'uses smaller threshold' do
+        expect(Gitlab).to receive(:staging?).and_return(true)
+
+        expect(ci_partition)
+          .to receive(:above_threshold?)
+          .with(Ci::Partition::GSTG_PARTITION_SIZE)
+          .and_call_original
+
+        expect { execute_service }.not_to change { Ci::Partition.count }
+      end
+    end
   end
 end
diff --git a/spec/services/ci/partitions/sync_service_spec.rb b/spec/services/ci/partitions/sync_service_spec.rb
index f0c21f1d766..cc7c2e74dc3 100644
--- a/spec/services/ci/partitions/sync_service_spec.rb
+++ b/spec/services/ci/partitions/sync_service_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe Ci::Partitions::SyncService, feature_category: :ci_scaling do
   let_it_be_with_reload(:ci_partition) { create(:ci_partition, :current) }
   let_it_be_with_reload(:next_ci_partition) { create(:ci_partition) }
+
   let(:service) { described_class.new(ci_partition) }
   let(:current_status) { Ci::Partition.statuses[:current] }
   let(:preparing_status) { Ci::Partition.statuses[:preparing] }
@@ -17,6 +18,10 @@ RSpec.describe Ci::Partitions::SyncService, feature_category: :ci_scaling do
     context 'when ci_auto_switch_to_dynamic_partitions is disabled' do
       before do
         stub_feature_flags(ci_auto_switch_to_dynamic_partitions: false)
+
+        allow_next_found_instance_of(Ci::Partition) do |partition|
+          allow(partition).to receive(:all_partitions_exist?).and_return(true)
+        end
       end
 
       it 'marks the next available partition as ready' do
@@ -39,13 +44,31 @@ RSpec.describe Ci::Partitions::SyncService, feature_category: :ci_scaling do
 
     context 'when all conditions are satisfied' do
       before do
-        allow(service).to receive(:above_threshold?).and_return(true)
         allow_next_found_instance_of(Ci::Partition) do |partition|
           allow(partition).to receive(:all_partitions_exist?).and_return(true)
         end
       end
 
       it 'updates ci_partitions statuses', :aggregate_failures do
+        expect(ci_partition).to receive(:above_threshold?).with(Ci::Partition::MAX_PARTITION_SIZE).and_return(true)
+
+        expect { execute_service }
+          .to change { ci_partition.reload.status }.from(current_status).to(active_status)
+          .and change { next_ci_partition.reload.status }.from(preparing_status).to(current_status)
+      end
+    end
+
+    context 'when executed on staging' do
+      before do
+        allow_next_found_instance_of(Ci::Partition) do |partition|
+          allow(partition).to receive(:all_partitions_exist?).and_return(true)
+        end
+      end
+
+      it 'updates ci_partitions statuses', :aggregate_failures do
+        expect(Gitlab).to receive(:staging?).and_return(true)
+        expect(ci_partition).to receive(:above_threshold?).with(Ci::Partition::GSTG_PARTITION_SIZE).and_return(true)
+
         expect { execute_service }
           .to change { ci_partition.reload.status }.from(current_status).to(active_status)
           .and change { next_ci_partition.reload.status }.from(preparing_status).to(current_status)
diff --git a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
index bef4549b8d5..849e6fc0b97 100644
--- a/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
+++ b/spec/services/ci/runners/set_runner_associated_projects_service_spec.rb
@@ -4,7 +4,10 @@ require 'spec_helper'
 
 RSpec.describe ::Ci::Runners::SetRunnerAssociatedProjectsService, '#execute', feature_category: :runner do
   subject(:execute) do
-    described_class.new(runner: runner, current_user: user, project_ids: new_projects.map(&:id)).execute
+    described_class.new(runner: runner, current_user: user, project_ids: new_projects.map(&:id)).execute.tap do
+      # Ensure we're recomputing the owner value
+      runner.clear_memoization(:owner)
+    end
   end
 
   let_it_be(:organization1) { create(:organization) }
diff --git a/spec/support/helpers/database/duplicate_indexes.yml b/spec/support/helpers/database/duplicate_indexes.yml
index 277584a4c55..5746fcea38c 100644
--- a/spec/support/helpers/database/duplicate_indexes.yml
+++ b/spec/support/helpers/database/duplicate_indexes.yml
@@ -2,6 +2,13 @@
 ci_job_artifact_states:
   index_on_job_artifact_id_partition_id_verification_state:
   - index_job_artifact_states_on_verification_state
+# TODO: will remove these ci_pipelines related rows when the duplicated index is removed
+ci_pipelines:
+  index_d8ae6ea3f3:
+  - index_ac3541b851
+p_ci_pipelines:
+  p_ci_pipelines_trigger_id_id_desc_idx:
+  - p_ci_pipelines_trigger_id_idx
 dast_site_tokens:
   index_dast_site_token_on_project_id_and_url:
   - index_dast_site_tokens_on_project_id
diff --git a/workhorse/cmd/gitlab-workhorse/gitaly_test.go b/workhorse/cmd/gitlab-workhorse/gitaly_test.go
index 7bcb9388c96..23dbab7534c 100644
--- a/workhorse/cmd/gitlab-workhorse/gitaly_test.go
+++ b/workhorse/cmd/gitlab-workhorse/gitaly_test.go
@@ -550,6 +550,9 @@ func TestGetDiffProxiedToGitalySuccessfully(t *testing.T) {
 	resp.Body.Close()
 	require.NoError(t, err)
 
+	contentType := resp.Header.Get("Content-Type")
+	require.Equal(t, "text/plain; charset=utf-8", contentType, "GET %q: content type", resp.Request.URL)
+
 	require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 	require.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
 }
@@ -567,6 +570,9 @@ func TestGetPatchProxiedToGitalySuccessfully(t *testing.T) {
 	resp.Body.Close()
 	require.NoError(t, err)
 
+	contentType := resp.Header.Get("Content-Type")
+	require.Equal(t, "text/plain; charset=utf-8", contentType, "GET %q: content type", resp.Request.URL)
+
 	require.Equal(t, 200, resp.StatusCode, "GET %q: status code", resp.Request.URL)
 	require.Equal(t, expectedBody, string(body), "GET %q: response body", resp.Request.URL)
 }
diff --git a/workhorse/internal/gitaly/diff.go b/workhorse/internal/gitaly/diff.go
index dc036970f0f..8711512c1aa 100644
--- a/workhorse/internal/gitaly/diff.go
+++ b/workhorse/internal/gitaly/diff.go
@@ -34,6 +34,8 @@ func (client *DiffClient) SendRawDiff(ctx context.Context, w http.ResponseWriter
 		return fmt.Errorf("rpc failed: %v", err)
 	}
 
+	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+
 	return client.sendStream(w, func() ([]byte, error) {
 		resp, err := c.Recv()
 		return resp.GetData(), err
@@ -47,6 +49,8 @@ func (client *DiffClient) SendRawPatch(ctx context.Context, w http.ResponseWrite
 		return fmt.Errorf("rpc failed: %v", err)
 	}
 
+	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+
 	return client.sendStream(w, func() ([]byte, error) {
 		resp, err := c.Recv()
 		return resp.GetData(), err
diff --git a/yarn.lock b/yarn.lock
index b284fabe64b..f9c83b1755c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1441,10 +1441,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.126.0.tgz#1c0bb95c11de808b78afd05dc95aca258c3b39f0"
   integrity sha512-7X8uzitNn7NDcVy+FVCw8npMNEUpLGHTO5Z+BJZqVILj/FD+0WveYdPxAEVa9hXYQn5qXWM0ZAknzB9LM6Id8w==
 
-"@gitlab/ui@111.10.0":
-  version "111.10.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-111.10.0.tgz#2425dd3427846eae797270586d9b3c82c2dda415"
-  integrity sha512-330KozNQJM7xY9bGI4gsJ3psxF1WgAVmeQEnlawmhyaHk0fPb+pzeA4qUNdkwhQcqIV46jz5wyLSRxnCa7W3Gg==
+"@gitlab/ui@111.10.1":
+  version "111.10.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-111.10.1.tgz#3229d7ed3a79256be407859e3ef973c98e37bee0"
+  integrity sha512-jYYFk/Srywa714tLKcSj6DlO/UziBBwQywfczorkoMiU7feykrVGJNFBFztUOeyf8S6nfce72AAbDDFFIKB0pA==
   dependencies:
     "@floating-ui/dom" "1.4.3"
     echarts "^5.3.2"