From f406422125feda94e6378ebc075f133eee1cd262 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Nov 2024 00:23:50 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/CODEOWNERS                            |  18 +-
 .../access_tokens/components/token.vue        |  20 +-
 .../access_tokens/components/tokens_app.vue   |  16 +-
 .../components/diff_discussion_reply.vue      |  18 +-
 .../notes/components/discussion_notes.vue     |   5 +-
 .../components/note_signed_out_widget.vue     |   2 +-
 .../components/user_popover/user_popover.vue  |   4 +-
 app/assets/stylesheets/framework.scss         |   1 +
 .../page_bundles/merge_requests.scss          |   5 +-
 .../page_bundles/notes/_diff_comments.scss    |   5 +
 app/models/hooks/web_hook_log.rb              |   3 +-
 .../personal_access_tokens/index.html.haml    |  48 ++--
 db/docs/abuse_trust_scores.yml                |   1 +
 db/docs/agent_activity_events.yml             |   1 +
 ...ics_cycle_analytics_issue_stage_events.yml |   1 +
 .../approval_merge_request_rule_sources.yml   |   1 +
 ...merge_request_rules_approved_approvers.yml |   1 +
 .../approval_merge_request_rules_groups.yml   |   1 +
 db/docs/approval_project_rules.yml            |   1 +
 db/docs/approval_project_rules_groups.yml     |   1 +
 ...roval_project_rules_protected_branches.yml |   1 +
 db/docs/approval_project_rules_users.yml      |   1 +
 db/docs/approvers.yml                         |   1 +
 db/docs/award_emoji.yml                       |   1 +
 db/docs/batched_background_migration_jobs.yml |   1 +
 db/docs/boards.yml                            |   1 +
 db/docs/bulk_import_export_uploads.yml        |   1 +
 db/docs/bulk_import_exports.yml               |   1 +
 db/docs/bulk_import_trackers.yml              |   1 +
 db/docs/ci_build_pending_states.yml           |   1 +
 db/docs/ci_build_trace_chunks.yml             |   1 +
 .../ci_daily_build_group_report_results.yml   |   1 +
 db/docs/ci_deleted_objects.yml                |   1 +
 db/docs/ci_group_variables.yml                |   1 +
 db/docs/ci_namespace_monthly_usages.yml       |   1 +
 db/docs/ci_pending_builds.yml                 |   1 +
 db/docs/ci_pipeline_artifacts.yml             |   1 +
 db/docs/ci_pipeline_metadata.yml              |   1 +
 db/docs/ci_pipeline_schedule_variables.yml    |   1 +
 db/docs/ci_pipeline_schedules.yml             |   1 +
 db/docs/ci_project_mirrors.yml                |   1 +
 db/docs/ci_project_monthly_usages.yml         |   1 +
 db/docs/ci_resource_groups.yml                |   1 +
 db/docs/ci_resources.yml                      |   1 +
 db/docs/ci_runner_machines.yml                |   1 +
 db/docs/ci_runner_namespaces.yml              |   1 +
 db/docs/ci_runner_projects.yml                |   1 +
 db/docs/ci_runners.yml                        |   1 +
 db/docs/ci_trigger_requests.yml               |   1 +
 db/docs/ci_unit_test_failures.yml             |   1 +
 db/docs/ci_variables.yml                      |   1 +
 db/docs/cluster_platforms_kubernetes.yml      |   1 +
 db/docs/clusters_kubernetes_namespaces.yml    |   1 +
 db/docs/container_expiration_policies.yml     |   1 +
 ...container_registry_data_repair_details.yml |   1 +
 db/docs/container_repositories.yml            |   1 +
 db/docs/container_repository_states.yml       |   1 +
 db/docs/dependency_proxy_blobs.yml            |   1 +
 db/docs/deploy_keys_projects.yml              |   1 +
 db/docs/deploy_tokens.yml                     |   1 +
 db/docs/deployment_clusters.yml               |   1 +
 db/docs/design_management_designs.yml         |   1 +
 .../design_management_designs_versions.yml    |   1 +
 db/docs/design_management_repositories.yml    |   1 +
 db/docs/design_management_versions.yml        |   1 +
 db/docs/dora_daily_metrics.yml                |   1 +
 db/docs/dora_performance_scores.yml           |   1 +
 db/docs/draft_notes.yml                       |   1 +
 db/docs/emails.yml                            |   1 +
 db/docs/environments.yml                      |   1 +
 db/docs/epic_issues.yml                       |   1 +
 db/docs/epics.yml                             |   1 +
 db/docs/evidences.yml                         |   1 +
 db/docs/external_pull_requests.yml            |   1 +
 db/docs/fork_network_members.yml              |   1 +
 db/docs/geo_event_log.yml                     |   1 +
 db/docs/geo_events.yml                        |   1 +
 db/docs/gitlab_subscription_histories.yml     |   1 +
 db/docs/gitlab_subscriptions.yml              |   1 +
 db/docs/gpg_keys.yml                          |   1 +
 db/docs/group_audit_events.yml                |   1 +
 db/docs/group_features.yml                    |   1 +
 db/docs/groups_visits.yml                     |   1 +
 db/docs/identities.yml                        |   1 +
 db/docs/import_export_uploads.yml             |   1 +
 db/docs/import_failures.yml                   |   1 +
 .../incident_management_timeline_events.yml   |   1 +
 db/docs/index_statuses.yml                    |   1 +
 db/docs/instance_audit_events.yml             |   1 +
 db/docs/integrations.yml                      |   1 +
 db/docs/internal_ids.yml                      |   1 +
 db/docs/issue_assignees.yml                   |   1 +
 db/docs/issue_assignment_events.yml           |   1 +
 db/docs/issue_email_participants.yml          |   1 +
 db/docs/issue_emails.yml                      |   1 +
 db/docs/issue_links.yml                       |   1 +
 db/docs/issue_metrics.yml                     |   1 +
 db/docs/issue_user_mentions.yml               |   1 +
 db/docs/jira_tracker_data.yml                 |   1 +
 db/docs/keys.yml                              |   1 +
 db/docs/labels.yml                            |   1 +
 db/docs/list_user_preferences.yml             |   1 +
 db/docs/lists.yml                             |   1 +
 .../loose_foreign_keys_deleted_records.yml    |   1 +
 db/docs/merge_request_assignment_events.yml   |   1 +
 ...erge_request_context_commit_diff_files.yml |   1 +
 db/docs/merge_request_diff_commit_users.yml   |   1 +
 db/docs/merge_request_diff_details.yml        |   1 +
 db/docs/merge_request_predictions.yml         |   1 +
 db/docs/merge_requests_closing_issues.yml     |   1 +
 .../merge_requests_compliance_violations.yml  |   1 +
 db/docs/merge_trains.yml                      |   1 +
 db/docs/milestones.yml                        |   1 +
 db/docs/ml_candidate_metrics.yml              |   1 +
 db/docs/namespace_details.yml                 |   1 +
 db/docs/namespace_ldap_settings.yml           |   1 +
 db/docs/namespace_root_storage_statistics.yml |   1 +
 db/docs/namespace_settings.yml                |   1 +
 db/docs/notification_settings.yml             |   1 +
 db/docs/onboarding_progresses.yml             |   1 +
 db/docs/operations_feature_flags_clients.yml  |   1 +
 db/docs/organization_details.yml              |   4 +-
 db/docs/organization_users.yml                |   1 +
 db/docs/organizations.yml                     |   4 +-
 .../p_ci_finished_build_ch_sync_events.yml    |   1 +
 db/docs/packages_build_infos.yml              |   1 +
 db/docs/packages_composer_metadata.yml        |   1 +
 db/docs/packages_conan_file_metadata.yml      |   1 +
 db/docs/packages_dependencies.yml             |   1 +
 db/docs/packages_helm_file_metadata.yml       |   1 +
 db/docs/packages_maven_metadata.yml           |   1 +
 db/docs/packages_npm_metadata.yml             |   1 +
 ...ackages_nuget_dependency_link_metadata.yml |   1 +
 db/docs/packages_nuget_metadata.yml           |   1 +
 db/docs/packages_nuget_symbols.yml            |   1 +
 db/docs/packages_package_file_build_infos.yml |   1 +
 db/docs/packages_pypi_metadata.yml            |   1 +
 db/docs/packages_tags.yml                     |   1 +
 .../packages_terraform_module_metadata.yml    |   1 +
 db/docs/pages_deployments.yml                 |   1 +
 db/docs/pages_domains.yml                     |   1 +
 db/docs/pm_advisories.yml                     |   1 +
 db/docs/pm_affected_packages.yml              |   1 +
 db/docs/pm_packages.yml                       |   1 +
 db/docs/project_auto_devops.yml               |   1 +
 db/docs/project_ci_cd_settings.yml            |   1 +
 ...project_compliance_standards_adherence.yml |   1 +
 db/docs/project_custom_attributes.yml         |   1 +
 db/docs/project_deploy_tokens.yml             |   1 +
 db/docs/project_export_jobs.yml               |   1 +
 db/docs/project_import_data.yml               |   1 +
 db/docs/project_mirror_data.yml               |   1 +
 db/docs/project_pages_metadata.yml            |   1 +
 db/docs/project_relation_export_uploads.yml   |   1 +
 db/docs/project_relation_exports.yml          |   1 +
 db/docs/project_repository_storage_moves.yml  |   1 +
 db/docs/project_security_settings.yml         |   1 +
 db/docs/project_settings.yml                  |   1 +
 db/docs/project_statistics.yml                |   1 +
 db/docs/project_topics.yml                    |   1 +
 db/docs/project_wiki_repositories.yml         |   1 +
 db/docs/projects_visits.yml                   |   1 +
 .../protected_branch_merge_access_levels.yml  |   1 +
 .../protected_branch_push_access_levels.yml   |   1 +
 ...otected_branch_unprotect_access_levels.yml |   1 +
 db/docs/protected_branches.yml                |   1 +
 .../protected_tag_create_access_levels.yml    |   1 +
 db/docs/push_rules.yml                        |   1 +
 db/docs/redirect_routes.yml                   |   1 +
 db/docs/release_links.yml                     |   1 +
 db/docs/remote_mirrors.yml                    |   1 +
 db/docs/repository_languages.yml              |   1 +
 db/docs/resource_iteration_events.yml         |   1 +
 db/docs/resource_milestone_events.yml         |   1 +
 db/docs/resource_weight_events.yml            |   1 +
 db/docs/reviews.yml                           |   1 +
 db/docs/sbom_component_versions.yml           |   1 +
 db/docs/sbom_components.yml                   |   1 +
 db/docs/sbom_occurrences_vulnerabilities.yml  |   1 +
 db/docs/sbom_sources.yml                      |   1 +
 db/docs/scan_result_policies.yml              |   1 +
 db/docs/scan_result_policy_violations.yml     |   1 +
 db/docs/snippet_repositories.yml              |   1 +
 db/docs/snippets.yml                          |   1 +
 db/docs/software_license_policies.yml         |   1 +
 db/docs/spam_logs.yml                         |   1 +
 db/docs/ssh_signatures.yml                    |   1 +
 db/docs/status_check_responses.yml            |   1 +
 db/docs/subscriptions.yml                     |   1 +
 db/docs/suggestions.yml                       |   1 +
 db/docs/tags.yml                              |   1 +
 db/docs/term_agreements.yml                   |   1 +
 db/docs/terraform_state_versions.yml          |   1 +
 db/docs/timelogs.yml                          |   1 +
 db/docs/topics.yml                            |   1 +
 db/docs/user_audit_events.yml                 |   1 +
 db/docs/user_callouts.yml                     |   1 +
 db/docs/user_custom_attributes.yml            |   1 +
 db/docs/user_details.yml                      |   1 +
 db/docs/user_highest_roles.yml                |   1 +
 db/docs/user_phone_number_validations.yml     |   1 +
 db/docs/user_preferences.yml                  |   1 +
 db/docs/users_star_projects.yml               |   1 +
 db/docs/vs_code_settings.yml                  |   1 +
 db/docs/vulnerability_feedback.yml            |   1 +
 db/docs/vulnerability_finding_evidences.yml   |   1 +
 db/docs/vulnerability_finding_signatures.yml  |   1 +
 .../vulnerability_findings_remediations.yml   |   1 +
 db/docs/vulnerability_identifiers.yml         |   1 +
 db/docs/vulnerability_issue_links.yml         |   1 +
 db/docs/vulnerability_scanners.yml            |   1 +
 db/docs/vulnerability_statistics.yml          |   1 +
 db/docs/web_hooks.yml                         |   1 +
 db/docs/wiki_page_meta.yml                    |   1 +
 db/docs/wiki_page_slugs.yml                   |   1 +
 db/docs/wiki_repository_states.yml            |   1 +
 db/docs/work_item_parent_links.yml            |   1 +
 db/docs/zoekt_repositories.yml                |   1 +
 db/docs/zoekt_tasks.yml                       |   1 +
 doc/administration/settings/jira_cloud_app.md |   3 +
 .../img/select-project-account_v17_7.png      | Bin 0 -> 20931 bytes
 .../visual_studio_code/index.md               |  37 ++-
 doc/install/aws/index.md                      |   6 +-
 doc/user/packages/npm_registry/index.md       | 250 ++++++++++--------
 doc/user/packages/package_registry/index.md   |   2 +-
 .../cli/flows/metric_definer.rb               |   9 +-
 scripts/internal_events/cli/metric.rb         |   1 -
 .../metric_definer_examples.yml               |   2 +-
 .../metrics/ee_total_28d_single_event.yml     |   3 -
 .../metrics/ee_total_7d_single_event.yml      |   3 -
 .../metrics/ee_total_single_event.yml         |   3 -
 .../metrics/keyboard_smashed_metric_28d.yml   |   4 -
 .../metrics/keyboard_smashed_metric_7d.yml    |   4 -
 ...abel_28d_single_event_additional_props.yml |   4 -
 ...label_7d_single_event_additional_props.yml |   4 -
 .../project_id_28d_multiple_events.yml        |   4 -
 .../metrics/project_id_7d_multiple_events.yml |   4 -
 ...otal_multi_event_some_additional_props.yml |   4 -
 .../total_multiple_events_with_rename.yml     |   4 -
 .../metrics/total_single_event.yml            |   4 -
 .../metrics/user_id_28d_single_event.yml      |   4 -
 ...r_id_28d_single_event_additional_props.yml |   4 -
 ..._28d_single_event_all_additional_props.yml |   4 -
 ..._id_28d_single_event_custom_key_filter.yml |   4 -
 .../metrics/user_id_7d_single_event.yml       |   4 -
 ...er_id_7d_single_event_additional_props.yml |   4 -
 ...d_7d_single_event_all_additional_props.yml |   4 -
 ...r_id_7d_single_event_custom_key_filter.yml |   4 -
 .../access_tokens/components/token_spec.js    |   9 +-
 .../components/diff_discussion_reply_spec.js  |  65 ++++-
 spec/lib/gitlab/database/sharding_key_spec.rb |   4 +-
 spec/models/hooks/web_hook_log_spec.rb        |   9 +-
 tooling/config/CODEOWNERS.yml                 |   4 +-
 253 files changed, 550 insertions(+), 286 deletions(-)
 create mode 100644 doc/editor_extensions/img/select-project-account_v17_7.png

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 178c7a81c56..f8c5ef5ee4b 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -222,7 +222,7 @@ Dangerfile
 ^[Secure] @gitlab-org/secure/dynamic-analysis-be
 /ee/app/services/app_sec/dast/
 
-^[Security Policies frontend] @gitlab-org/govern/security-policies-frontend
+^[Security Policies frontend] @gitlab-org/security-risk-management/security-policies/frontend
 /ee/app/assets/javascripts/approvals/components/license_compliance/**
 /ee/app/assets/javascripts/approvals/stores/modules/license_compliance/**
 /ee/app/assets/javascripts/license_compliance/**
@@ -250,7 +250,7 @@ Dangerfile
 /ee/spec/frontend/security_orchestration/**
 /ee/spec/views/projects/security/policies/**
 
-^[Security Policies backend] @gitlab-org/govern/security-policies-backend
+^[Security Policies backend] @gitlab-org/security-risk-management/security-policies/backend
 /app/models/clusters/applications/cilium.rb
 /ee/app/controllers/groups/security/policies_controller.rb
 /ee/app/controllers/projects/security/policies_controller.rb
@@ -302,7 +302,7 @@ Dangerfile
 /app/finders/security/license_compliance_jobs_finder.rb
 /ee/app/controllers/projects/licenses_controller.rb
 /ee/app/finders/software_license_policies_finder.rb
-/ee/app/models/sca/license_compliance.rb @gitlab-org/govern/security-policies-backend @gitlab-org/secure/composition-analysis-be
+/ee/app/models/sca/license_compliance.rb @gitlab-org/security-risk-management/security-policies/backend @gitlab-org/secure/composition-analysis-be
 /ee/app/models/sca/license_policy.rb
 /ee/app/models/software_license_policy.rb
 /ee/app/models/software_license.rb
@@ -323,7 +323,7 @@ Dangerfile
 /ee/spec/factories/spdx_license.rb
 /ee/spec/finders/software_license_policies_finder_spec.rb
 /ee/spec/lib/gitlab/ci/parsers/license_compliance/**
-/ee/spec/models/sca/license_compliance_spec.rb @gitlab-org/govern/security-policies-backend @gitlab-org/secure/composition-analysis-be
+/ee/spec/models/sca/license_compliance_spec.rb @gitlab-org/security-risk-management/security-policies/backend @gitlab-org/secure/composition-analysis-be
 /ee/spec/models/sca/license_policy_spec.rb
 /ee/spec/models/software_license_policy_spec.rb
 /ee/spec/models/software_license_spec.rb
@@ -917,7 +917,7 @@ lib/gitlab/checks/**
 /doc/development/ai_features/ @gitlab-org/ai-powered
 /doc/development/ai_features/embeddings.md @gitlab-org/search-team/migration-maintainers
 /doc/development/application_limits.md @gitlab-org/distribution
-/doc/development/audit_event_guide/ @gitlab-org/govern/security-policies-frontend @gitlab-org/govern/threat-insights-frontend-team @gitlab-org/govern/threat-insights-backend-team
+/doc/development/audit_event_guide/ @gitlab-org/security-risk-management/security-policies/frontend @gitlab-org/govern/threat-insights-frontend-team @gitlab-org/govern/threat-insights-backend-team
 /doc/development/avoiding_required_stops.md @gitlab-org/distribution
 /doc/development/build_test_package.md @gitlab-org/distribution
 /doc/development/cascading_settings.md @gitlab-org/foundations/engineering
@@ -944,7 +944,7 @@ lib/gitlab/checks/**
 /doc/development/permissions.md @rlehmann1
 /doc/development/permissions/ @rlehmann1
 /doc/development/pipelines/ @gl-quality/eng-prod
-/doc/development/policies.md @gitlab-org/govern/authentication/approvers
+/doc/development/policies.md @gitlab-org/software-supply-chain-security/authentication/approvers
 /doc/development/prometheus_metrics.md @gitlab-org/analytics-section/product-analytics/engineers/frontend
 /doc/development/search/ @gitlab-org/search-team/migration-maintainers
 /doc/development/sec/ @gitlab-org/govern/threat-insights-frontend-team
@@ -1173,7 +1173,7 @@ lib/gitlab/checks/**
 /doc/user/workspace/ @ashrafkhamis
 # End rake-managed-docs-block
 
-[Authorization] @gitlab-org/govern/authorization/approvers
+[Authorization] @gitlab-org/software-supply-chain-security/authorization/approvers
 /config/initializers/declarative_policy.rb
 /config/initializers/declarative_policy_cached_attributes.rb
 /app/policies/
@@ -1198,7 +1198,7 @@ lib/gitlab/checks/**
 /app/assets/javascripts/packages_and_registries/harbor_registry/
 /ee/app/services/ee/auth/container_registry_authentication_service.rb
 
-[Authentication] @gitlab-org/govern/authentication/approvers
+[Authentication] @gitlab-org/software-supply-chain-security/authentication/approvers
 /app/assets/javascripts/access_tokens/
 /app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql
 /app/assets/javascripts/authentication/
@@ -1607,7 +1607,7 @@ lib/api/entities/project_identity.rb
 lib/api/entities/project.rb
 ee/lib/ee/api/entities/project.rb
 
-[Compliance] @gitlab-org/govern/compliance/engineering
+[Compliance] @gitlab-org/software-supply-chain-security/compliance/engineering
 /app/services/audit_events/build_service.rb
 /ee/app/services/ee/audit_events/build_service.rb
 /app/models/audit_event.rb
diff --git a/app/assets/javascripts/access_tokens/components/token.vue b/app/assets/javascripts/access_tokens/components/token.vue
index 756d761ec97..a4cf9d2c122 100644
--- a/app/assets/javascripts/access_tokens/components/token.vue
+++ b/app/assets/javascripts/access_tokens/components/token.vue
@@ -1,9 +1,10 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
 import InputCopyToggleVisibility from '~/vue_shared/components/form/input_copy_toggle_visibility.vue';
+import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
 
 export default {
-  components: { InputCopyToggleVisibility },
+  components: { InputCopyToggleVisibility, SettingsSection },
   props: {
     token: {
       type: String,
@@ -36,9 +37,14 @@ export default {
 </script>
 
 <template>
-  <div>
-    <h4 class="gl-my-0"><slot name="title"></slot></h4>
-    <slot name="description"></slot>
+  <settings-section>
+    <template #heading>
+      <slot name="title"></slot>
+    </template>
+    <template #description>
+      <slot name="description"></slot>
+    </template>
+
     <input-copy-toggle-visibility
       :label="inputLabel"
       :label-for="inputId"
@@ -49,8 +55,10 @@ export default {
       :size="size"
     >
       <template #description>
-        <slot name="input-description"></slot>
+        <div class="gl-mt-3">
+          <slot name="input-description"></slot>
+        </div>
       </template>
     </input-copy-toggle-visibility>
-  </div>
+  </settings-section>
 </template>
diff --git a/app/assets/javascripts/access_tokens/components/tokens_app.vue b/app/assets/javascripts/access_tokens/components/tokens_app.vue
index 5b1019f72ba..a288253c07b 100644
--- a/app/assets/javascripts/access_tokens/components/tokens_app.vue
+++ b/app/assets/javascripts/access_tokens/components/tokens_app.vue
@@ -1,9 +1,7 @@
 <script>
 import { GlSprintf, GlLink } from '@gitlab/ui';
 import { pickBy } from 'lodash';
-
 import { s__ } from '~/locale';
-
 import { FEED_TOKEN, INCOMING_EMAIL_TOKEN, STATIC_OBJECT_TOKEN } from '../constants';
 import Token from './token.vue';
 
@@ -79,7 +77,7 @@ export default {
 </script>
 
 <template>
-  <div class="settings-section js-search-settings-section !gl-pt-0">
+  <div>
     <token
       v-for="(tokenData, tokenType) in enabledTokenTypes"
       :key="tokenType"
@@ -91,17 +89,11 @@ export default {
       size="md"
     >
       <template #title>
-        <div class="settings-sticky-header">
-          <div class="settings-sticky-header-inner">
-            {{ $options.i18n[tokenType].label }}
-          </div>
-        </div>
+        {{ $options.i18n[tokenType].label }}
       </template>
       <template #description>
-        <p class="gl-text-secondary">
-          {{ $options.i18n[tokenType].description }}
-          {{ $options.i18n.canNotAccessOtherData }}
-        </p>
+        {{ $options.i18n[tokenType].description }}
+        {{ $options.i18n.canNotAccessOtherData }}
       </template>
       <template #input-description>
         <gl-sprintf :message="$options.i18n[tokenType].inputDescription">
diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
index 3ab22a1d815..9b7ee725edb 100644
--- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
+++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
@@ -3,6 +3,8 @@ import { GlButton } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapGetters } from 'vuex';
 import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue';
+import DiscussionLockedWidget from '~/notes/components/discussion_locked_widget.vue';
+import { COMMENT_FORM } from '../../notes/i18n';
 
 import { START_THREAD } from '../i18n';
 
@@ -10,9 +12,11 @@ export default {
   name: 'DiffDiscussionReply',
   i18n: {
     START_THREAD,
+    COMMENT_FORM,
   },
   components: {
     GlButton,
+    DiscussionLockedWidget,
     NoteSignedOutWidget,
   },
   props: {
@@ -30,14 +34,26 @@ export default {
     ...mapGetters({
       currentUser: 'getUserData',
       userCanReply: 'userCanReply',
+      getNoteableData: 'getNoteableData',
     }),
+    isLoggedIn() {
+      return this.currentUser?.id;
+    },
+    canCreateNote() {
+      return this.userCanReply && this.getNoteableData.current_user.can_create_note;
+    },
   },
 };
 </script>
 
 <template>
   <div class="discussion-reply-holder clearfix gl-flex">
-    <template v-if="userCanReply">
+    <discussion-locked-widget
+      v-if="!canCreateNote && isLoggedIn"
+      :issuable-type="$options.i18n.COMMENT_FORM.mergeRequest"
+      class="!gl-mt-0 gl-grow"
+    />
+    <template v-else-if="isLoggedIn">
       <slot v-if="hasForm" name="form"></slot>
       <template v-else-if="renderReplyPlaceholder">
         <gl-button @click="$emit('showNewDiscussionForm')">
diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue
index e8f59ef2c11..825e0224753 100644
--- a/app/assets/javascripts/notes/components/discussion_notes.vue
+++ b/app/assets/javascripts/notes/components/discussion_notes.vue
@@ -165,7 +165,10 @@ export default {
             <slot name="avatar-badge"></slot>
           </template>
         </component>
-        <discussion-notes-replies-wrapper :is-diff-discussion="discussion.diff_discussion">
+        <discussion-notes-replies-wrapper
+          v-if="hasReplies || userCanReply"
+          :is-diff-discussion="discussion.diff_discussion"
+        >
           <toggle-replies-widget
             v-if="hasReplies"
             :collapsed="!isExpanded"
diff --git a/app/assets/javascripts/notes/components/note_signed_out_widget.vue b/app/assets/javascripts/notes/components/note_signed_out_widget.vue
index 738af4f6064..95af509a7e0 100644
--- a/app/assets/javascripts/notes/components/note_signed_out_widget.vue
+++ b/app/assets/javascripts/notes/components/note_signed_out_widget.vue
@@ -35,5 +35,5 @@ export default {
 </script>
 
 <template>
-  <div v-safe-html="signedOutText" class="disabled-comment gl-text-center gl-text-secondary"></div>
+  <div v-safe-html="signedOutText" class="gl-grow gl-text-center gl-text-subtle"></div>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index c296d4f15bc..13e62cc93c2 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -245,7 +245,7 @@ export default {
         <template #meta>
           <span
             v-if="hasPronouns"
-            class="gl-p-1 gl-text-sm gl-font-normal gl-text-gray-500"
+            class="gl-p-1 gl-text-sm gl-font-normal gl-text-subtle"
             data-testid="user-popover-pronouns"
             >({{ user.pronouns }})</span
           >
@@ -266,7 +266,7 @@ export default {
       </template>
       <template v-else>
         <template v-if="!isBlocked">
-          <div class="gl-text-gray-500">
+          <div class="gl-text-subtle">
             <div v-if="user.email" class="gl-mb-2 gl-flex">
               <gl-icon name="mail" class="gl-shrink-0" />
               <span ref="email" class="gl-ml-2">{{ user.email }}</span>
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 25c6b49e9bc..a9a24d43e60 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -3,6 +3,7 @@
 @import 'framework/mixins';
 
 @import '@gitlab/ui/src/scss/gitlab_ui';
+@import '@gitlab/duo-ui/src/scss/components';
 
 @import 'bootstrap_migration';
 @import 'framework/layout';
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index 4ccdc133b0d..e3163f0c128 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -645,8 +645,7 @@
 }
 
 .mr-widget-extension {
-  border-top: 1px solid var(--gl-border-color-default);
-  background-color: var(--gray-10, $gray-10);
+  @apply gl-bg-subtle gl-border-t gl-border-t-section;
   container-name: mr-widget-extension;
   container-type: inline-size;
   // Adds a fix for the view app dropdown not showing up
@@ -655,7 +654,7 @@
   z-index: 1;
 
   &.clickable:hover {
-    background-color: var(--gray-50, $gray-50);
+    @apply gl-bg-strong;
     cursor: pointer;
   }
 }
diff --git a/app/assets/stylesheets/page_bundles/notes/_diff_comments.scss b/app/assets/stylesheets/page_bundles/notes/_diff_comments.scss
index 7c92de72698..9cdd26a6ba8 100644
--- a/app/assets/stylesheets/page_bundles/notes/_diff_comments.scss
+++ b/app/assets/stylesheets/page_bundles/notes/_diff_comments.scss
@@ -313,7 +313,12 @@
 .diff-files-holder {
   .discussion-notes .timeline-entry:first-of-type > .timeline-entry-inner {
     @apply gl-border-b gl-border-b-subtle dark:gl-border-b-section;
+
+    .timeline-entry:last-child .timeline-entry-inner {
+      @apply gl-border-b-0;
+    }
   }
+
 }
 
 .diffs {
diff --git a/app/models/hooks/web_hook_log.rb b/app/models/hooks/web_hook_log.rb
index 05e5c6f5827..8c904cf44bc 100644
--- a/app/models/hooks/web_hook_log.rb
+++ b/app/models/hooks/web_hook_log.rb
@@ -59,8 +59,7 @@ class WebHookLog < ApplicationRecord
   end
 
   def request_headers
-    super unless web_hook.token?
-    super if self[:request_headers]['X-Gitlab-Token'] == _('[REDACTED]')
+    return super unless self[:request_headers]['X-Gitlab-Token']
 
     self[:request_headers].merge('X-Gitlab-Token' => _('[REDACTED]'))
   end
diff --git a/app/views/user_settings/personal_access_tokens/index.html.haml b/app/views/user_settings/personal_access_tokens/index.html.haml
index 785446d6ed4..6557bba3286 100644
--- a/app/views/user_settings/personal_access_tokens/index.html.haml
+++ b/app/views/user_settings/personal_access_tokens/index.html.haml
@@ -4,36 +4,32 @@
 - type_plural = _('personal access tokens')
 - @force_desktop_expanded_sidebar = true
 
-.settings-section.settings-section-no-bottom.js-search-settings-section
-  .settings-sticky-header
-    .settings-sticky-header-inner
-      %h4.gl-my-0
-        = page_title
-  %p.gl-text-subtle
+= render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
+  - c.with_description do
     = s_('AccessTokens|You can generate a personal access token for each application you use that needs access to the GitLab API.')
     = s_('AccessTokens|You can also use personal access tokens to authenticate against Git over HTTP.')
     = s_('AccessTokens|They are the only accepted password when you have Two-Factor Authentication (2FA) enabled.')
+  - c.with_body do
+    #js-new-access-token-app{ data: { access_token_type: type } }
 
-  #js-new-access-token-app{ data: { access_token_type: type } }
+    = render ::Layouts::CrudComponent.new(_('Active personal access tokens'),
+      icon: 'token',
+      count: @active_access_tokens_size,
+      count_options: { class: 'js-token-count' },
+      toggle_text: _('Add new token'),
+      toggle_options: { data: { testid: 'add-new-token-button' } },
+      form_options: { class: 'js-add-new-token-form' },
+      options: { class: 'js-token-card' }) do |c|
+      - c.with_form do
+        = render 'shared/access_tokens/form',
+          ajax: true,
+          type: type,
+          path: user_settings_personal_access_tokens_path,
+          token: @personal_access_token,
+          scopes: @scopes,
+          help_path: help_page_path('user/profile/personal_access_tokens.md', anchor: 'personal-access-token-scopes')
 
-  = render ::Layouts::CrudComponent.new(_('Active personal access tokens'),
-    icon: 'token',
-    count: @active_access_tokens_size,
-    count_options: { class: 'js-token-count' },
-    toggle_text: _('Add new token'),
-    toggle_options: { data: { testid: 'add-new-token-button' } },
-    form_options: { class: 'js-add-new-token-form' },
-    options: { class: 'gl-mt-5 js-token-card' }) do |c|
-    - c.with_form do
-      = render 'shared/access_tokens/form',
-        ajax: true,
-        type: type,
-        path: user_settings_personal_access_tokens_path,
-        token: @personal_access_token,
-        scopes: @scopes,
-        help_path: help_page_path('user/profile/personal_access_tokens.md', anchor: 'personal-access-token-scopes')
-
-    - c.with_body do
-      #js-access-token-table-app{ data: { access_token_type: type, access_token_type_plural: type_plural, backend_pagination: 'true', initial_active_access_tokens: @active_access_tokens.to_json } }
+      - c.with_body do
+        #js-access-token-table-app{ data: { access_token_type: type, access_token_type_plural: type_plural, backend_pagination: 'true', initial_active_access_tokens: @active_access_tokens.to_json } }
 
 #js-tokens-app{ data: { tokens_data: tokens_app_data } }
diff --git a/db/docs/abuse_trust_scores.yml b/db/docs/abuse_trust_scores.yml
index d4e70ae993f..90c247465bf 100644
--- a/db/docs/abuse_trust_scores.yml
+++ b/db/docs/abuse_trust_scores.yml
@@ -8,3 +8,4 @@ description: Aggregates per-user scores related to potential product abuse.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117301
 milestone: '15.11'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/agent_activity_events.yml b/db/docs/agent_activity_events.yml
index daf7e237c35..6b5aac7ce4c 100644
--- a/db/docs/agent_activity_events.yml
+++ b/db/docs/agent_activity_events.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   agent_project_id: projects
+table_size: small
diff --git a/db/docs/analytics_cycle_analytics_issue_stage_events.yml b/db/docs/analytics_cycle_analytics_issue_stage_events.yml
index d6894243c2e..88837fb590b 100644
--- a/db/docs/analytics_cycle_analytics_issue_stage_events.yml
+++ b/db/docs/analytics_cycle_analytics_issue_stage_events.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/approval_merge_request_rule_sources.yml b/db/docs/approval_merge_request_rule_sources.yml
index a59983ee704..2fbe128275a 100644
--- a/db/docs/approval_merge_request_rule_sources.yml
+++ b/db/docs/approval_merge_request_rule_sources.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: approval_project_rule
 desired_sharding_key_migration_job_name: BackfillApprovalMergeRequestRuleSourcesProjectId
+table_size: small
diff --git a/db/docs/approval_merge_request_rules_approved_approvers.yml b/db/docs/approval_merge_request_rules_approved_approvers.yml
index b2a1478cda9..2bc1be09f6a 100644
--- a/db/docs/approval_merge_request_rules_approved_approvers.yml
+++ b/db/docs/approval_merge_request_rules_approved_approvers.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: approval_merge_request_rule
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/approval_merge_request_rules_groups.yml b/db/docs/approval_merge_request_rules_groups.yml
index d041bdb0163..3129dbb3849 100644
--- a/db/docs/approval_merge_request_rules_groups.yml
+++ b/db/docs/approval_merge_request_rules_groups.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/approval_project_rules.yml b/db/docs/approval_project_rules.yml
index 76f39080ab7..730c8b2c5c7 100644
--- a/db/docs/approval_project_rules.yml
+++ b/db/docs/approval_project_rules.yml
@@ -10,3 +10,4 @@ milestone: '11.7'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/approval_project_rules_groups.yml b/db/docs/approval_project_rules_groups.yml
index ce0223f9c12..87378e5fe9d 100644
--- a/db/docs/approval_project_rules_groups.yml
+++ b/db/docs/approval_project_rules_groups.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/approval_project_rules_protected_branches.yml b/db/docs/approval_project_rules_protected_branches.yml
index 6ab81dbe594..2b000e22d0b 100644
--- a/db/docs/approval_project_rules_protected_branches.yml
+++ b/db/docs/approval_project_rules_protected_branches.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: approval_project_rule
 desired_sharding_key_migration_job_name: BackfillApprovalProjectRulesProtectedBranchesProjectId
+table_size: small
diff --git a/db/docs/approval_project_rules_users.yml b/db/docs/approval_project_rules_users.yml
index 8a65dd1c6be..48d189ff963 100644
--- a/db/docs/approval_project_rules_users.yml
+++ b/db/docs/approval_project_rules_users.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: approval_project_rule
 desired_sharding_key_migration_job_name: BackfillApprovalProjectRulesUsersProjectId
+table_size: small
diff --git a/db/docs/approvers.yml b/db/docs/approvers.yml
index 8eced3f945c..90a1c507ebf 100644
--- a/db/docs/approvers.yml
+++ b/db/docs/approvers.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 exempt_from_sharding: true
 notes: Exempted because Marked for drop - https://gitlab.com/gitlab-org/gitlab/-/issues/444234
+table_size: small
diff --git a/db/docs/award_emoji.yml b/db/docs/award_emoji.yml
index cdf1efa6375..8499f43dbe0 100644
--- a/db/docs/award_emoji.yml
+++ b/db/docs/award_emoji.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/37
 milestone: '8.9'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/batched_background_migration_jobs.yml b/db/docs/batched_background_migration_jobs.yml
index f2f9bee607d..7a040aae8a9 100644
--- a/db/docs/batched_background_migration_jobs.yml
+++ b/db/docs/batched_background_migration_jobs.yml
@@ -9,3 +9,4 @@ description: The batched_background_migration_jobs table stores information abou
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54628
 milestone: '13.10'
 gitlab_schema: gitlab_shared
+table_size: small
diff --git a/db/docs/boards.yml b/db/docs/boards.yml
index aa282ab5e42..367aecc63f6 100644
--- a/db/docs/boards.yml
+++ b/db/docs/boards.yml
@@ -14,3 +14,4 @@ allow_cross_foreign_keys:
 sharding_key:
   group_id: namespaces
   project_id: projects
+table_size: small
diff --git a/db/docs/bulk_import_export_uploads.yml b/db/docs/bulk_import_export_uploads.yml
index c237fbff4bd..8aa85f319c3 100644
--- a/db/docs/bulk_import_export_uploads.yml
+++ b/db/docs/bulk_import_export_uploads.yml
@@ -26,3 +26,4 @@ desired_sharding_key:
         table: bulk_import_exports
         sharding_key: group_id
         belongs_to: export
+table_size: small
diff --git a/db/docs/bulk_import_exports.yml b/db/docs/bulk_import_exports.yml
index 0deef25db31..3babedfddd8 100644
--- a/db/docs/bulk_import_exports.yml
+++ b/db/docs/bulk_import_exports.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 sharding_key:
   project_id: projects
   group_id: namespaces
+table_size: small
diff --git a/db/docs/bulk_import_trackers.yml b/db/docs/bulk_import_trackers.yml
index 91ea68f7d6f..1655ed31e6c 100644
--- a/db/docs/bulk_import_trackers.yml
+++ b/db/docs/bulk_import_trackers.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47009
 milestone: '13.6'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463854
+table_size: small
diff --git a/db/docs/ci_build_pending_states.yml b/db/docs/ci_build_pending_states.yml
index 1c239e73fad..7abde5869f8 100644
--- a/db/docs/ci_build_pending_states.yml
+++ b/db/docs/ci_build_pending_states.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41585
 milestone: '13.4'
 gitlab_schema: gitlab_ci
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/458479
+table_size: small
diff --git a/db/docs/ci_build_trace_chunks.yml b/db/docs/ci_build_trace_chunks.yml
index 3d2b6e23ef7..635f048e696 100644
--- a/db/docs/ci_build_trace_chunks.yml
+++ b/db/docs/ci_build_trace_chunks.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: build
         foreign_key_name: fk_89e29fa5ee_p
+table_size: small
diff --git a/db/docs/ci_daily_build_group_report_results.yml b/db/docs/ci_daily_build_group_report_results.yml
index 619f1d85d6f..b9818c7424c 100644
--- a/db/docs/ci_daily_build_group_report_results.yml
+++ b/db/docs/ci_daily_build_group_report_results.yml
@@ -11,3 +11,4 @@ milestone: '13.0'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_deleted_objects.yml b/db/docs/ci_deleted_objects.yml
index f746304b0b4..b66302104c7 100644
--- a/db/docs/ci_deleted_objects.yml
+++ b/db/docs/ci_deleted_objects.yml
@@ -10,3 +10,4 @@ milestone: '13.5'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_group_variables.yml b/db/docs/ci_group_variables.yml
index 52851baa67c..b296565e002 100644
--- a/db/docs/ci_group_variables.yml
+++ b/db/docs/ci_group_variables.yml
@@ -10,3 +10,4 @@ milestone: '9.4'
 gitlab_schema: gitlab_ci
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/ci_namespace_monthly_usages.yml b/db/docs/ci_namespace_monthly_usages.yml
index a7e0c1fb1db..cd9c58ce40d 100644
--- a/db/docs/ci_namespace_monthly_usages.yml
+++ b/db/docs/ci_namespace_monthly_usages.yml
@@ -10,3 +10,4 @@ milestone: '13.9'
 gitlab_schema: gitlab_ci
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/ci_pending_builds.yml b/db/docs/ci_pending_builds.yml
index 06e28d3bb74..06eb46bb536 100644
--- a/db/docs/ci_pending_builds.yml
+++ b/db/docs/ci_pending_builds.yml
@@ -10,3 +10,4 @@ milestone: '14.0'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_pipeline_artifacts.yml b/db/docs/ci_pipeline_artifacts.yml
index ea377aa8981..865f348fba7 100644
--- a/db/docs/ci_pipeline_artifacts.yml
+++ b/db/docs/ci_pipeline_artifacts.yml
@@ -10,3 +10,4 @@ milestone: '13.3'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_pipeline_metadata.yml b/db/docs/ci_pipeline_metadata.yml
index a4257ab2f8f..66ef6ddac51 100644
--- a/db/docs/ci_pipeline_metadata.yml
+++ b/db/docs/ci_pipeline_metadata.yml
@@ -10,3 +10,4 @@ milestone: '15.5'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_pipeline_schedule_variables.yml b/db/docs/ci_pipeline_schedule_variables.yml
index 7349a57078a..7f3a6e84e16 100644
--- a/db/docs/ci_pipeline_schedule_variables.yml
+++ b/db/docs/ci_pipeline_schedule_variables.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: pipeline_schedule
 desired_sharding_key_migration_job_name: BackfillCiPipelineScheduleVariablesProjectId
+table_size: small
diff --git a/db/docs/ci_pipeline_schedules.yml b/db/docs/ci_pipeline_schedules.yml
index 837f4b35777..28998c4268f 100644
--- a/db/docs/ci_pipeline_schedules.yml
+++ b/db/docs/ci_pipeline_schedules.yml
@@ -10,3 +10,4 @@ milestone: '9.2'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_project_mirrors.yml b/db/docs/ci_project_mirrors.yml
index 328ec504ac0..ffb510f12cf 100644
--- a/db/docs/ci_project_mirrors.yml
+++ b/db/docs/ci_project_mirrors.yml
@@ -11,3 +11,4 @@ milestone: '14.6'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_project_monthly_usages.yml b/db/docs/ci_project_monthly_usages.yml
index 8c60852a00e..e123b7fbe02 100644
--- a/db/docs/ci_project_monthly_usages.yml
+++ b/db/docs/ci_project_monthly_usages.yml
@@ -10,3 +10,4 @@ milestone: '13.9'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_resource_groups.yml b/db/docs/ci_resource_groups.yml
index 480fddb6e08..656f0e6a0ec 100644
--- a/db/docs/ci_resource_groups.yml
+++ b/db/docs/ci_resource_groups.yml
@@ -10,3 +10,4 @@ milestone: '12.7'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_resources.yml b/db/docs/ci_resources.yml
index 5a8aa27ec2e..97e4b8c6896 100644
--- a/db/docs/ci_resources.yml
+++ b/db/docs/ci_resources.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: resource_group
 desired_sharding_key_migration_job_name: BackfillCiResourcesProjectId
+table_size: small
diff --git a/db/docs/ci_runner_machines.yml b/db/docs/ci_runner_machines.yml
index 6ad3198be7c..0746693012f 100644
--- a/db/docs/ci_runner_machines.yml
+++ b/db/docs/ci_runner_machines.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107801
 milestone: '15.8'
 gitlab_schema: gitlab_ci
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/460084
+table_size: small
diff --git a/db/docs/ci_runner_namespaces.yml b/db/docs/ci_runner_namespaces.yml
index b8450c8e790..e7cc9d695db 100644
--- a/db/docs/ci_runner_namespaces.yml
+++ b/db/docs/ci_runner_namespaces.yml
@@ -10,3 +10,4 @@ milestone: '10.8'
 gitlab_schema: gitlab_ci
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/ci_runner_projects.yml b/db/docs/ci_runner_projects.yml
index fad9a6b0ecd..1cda8ffd632 100644
--- a/db/docs/ci_runner_projects.yml
+++ b/db/docs/ci_runner_projects.yml
@@ -10,3 +10,4 @@ milestone: '8.0'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/ci_runners.yml b/db/docs/ci_runners.yml
index 24d80e6f1c6..7e94006de72 100644
--- a/db/docs/ci_runners.yml
+++ b/db/docs/ci_runners.yml
@@ -11,3 +11,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/046b28312704f31
 milestone: '8.0'
 gitlab_schema: gitlab_ci
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442395
+table_size: small
diff --git a/db/docs/ci_trigger_requests.yml b/db/docs/ci_trigger_requests.yml
index e0c48482d3e..7876415f690 100644
--- a/db/docs/ci_trigger_requests.yml
+++ b/db/docs/ci_trigger_requests.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         belongs_to: trigger
         foreign_key_name: fk_b8ec8b7245
 desired_sharding_key_migration_job_name: BackfillCiTriggerRequestsProjectId
+table_size: small
diff --git a/db/docs/ci_unit_test_failures.yml b/db/docs/ci_unit_test_failures.yml
index 89350b30c43..8eae5fdb66c 100644
--- a/db/docs/ci_unit_test_failures.yml
+++ b/db/docs/ci_unit_test_failures.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: unit_test
 desired_sharding_key_migration_job_name: BackfillCiUnitTestFailuresProjectId
+table_size: small
diff --git a/db/docs/ci_variables.yml b/db/docs/ci_variables.yml
index 0c4d94817e3..31cb5b8110b 100644
--- a/db/docs/ci_variables.yml
+++ b/db/docs/ci_variables.yml
@@ -10,3 +10,4 @@ milestone: '8.0'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/cluster_platforms_kubernetes.yml b/db/docs/cluster_platforms_kubernetes.yml
index 1562f0bf222..1af637e39d1 100644
--- a/db/docs/cluster_platforms_kubernetes.yml
+++ b/db/docs/cluster_platforms_kubernetes.yml
@@ -10,3 +10,4 @@ milestone: '10.2'
 gitlab_schema: gitlab_main
 exempt_from_sharding: true
 notes: Exempted because Table is scheduled for removal
+table_size: small
diff --git a/db/docs/clusters_kubernetes_namespaces.yml b/db/docs/clusters_kubernetes_namespaces.yml
index 7efa129a6d5..cbdffe0e41f 100644
--- a/db/docs/clusters_kubernetes_namespaces.yml
+++ b/db/docs/clusters_kubernetes_namespaces.yml
@@ -10,3 +10,4 @@ milestone: '11.5'
 gitlab_schema: gitlab_main
 exempt_from_sharding: true
 notes: Exempted because Table is scheduled for removal
+table_size: small
diff --git a/db/docs/container_expiration_policies.yml b/db/docs/container_expiration_policies.yml
index 20d9d41866a..c5d6566a931 100644
--- a/db/docs/container_expiration_policies.yml
+++ b/db/docs/container_expiration_policies.yml
@@ -10,3 +10,4 @@ milestone: '12.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/container_registry_data_repair_details.yml b/db/docs/container_registry_data_repair_details.yml
index a0af1c700e3..149225e2f4e 100644
--- a/db/docs/container_registry_data_repair_details.yml
+++ b/db/docs/container_registry_data_repair_details.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/container_repositories.yml b/db/docs/container_repositories.yml
index 3f072a16568..356354ed5bd 100644
--- a/db/docs/container_repositories.yml
+++ b/db/docs/container_repositories.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/container_repository_states.yml b/db/docs/container_repository_states.yml
index 6bb70efb058..40ab565eeef 100644
--- a/db/docs/container_repository_states.yml
+++ b/db/docs/container_repository_states.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: container_repository
 desired_sharding_key_migration_job_name: BackfillContainerRepositoryStatesProjectId
+table_size: small
diff --git a/db/docs/dependency_proxy_blobs.yml b/db/docs/dependency_proxy_blobs.yml
index 8ec521f0dd3..87ba5851cb4 100644
--- a/db/docs/dependency_proxy_blobs.yml
+++ b/db/docs/dependency_proxy_blobs.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/deploy_keys_projects.yml b/db/docs/deploy_keys_projects.yml
index 1224d8672cd..181ec523d6a 100644
--- a/db/docs/deploy_keys_projects.yml
+++ b/db/docs/deploy_keys_projects.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/deploy_tokens.yml b/db/docs/deploy_tokens.yml
index dfb2b55f3ec..c66544d28ce 100644
--- a/db/docs/deploy_tokens.yml
+++ b/db/docs/deploy_tokens.yml
@@ -8,3 +8,4 @@ description: https://docs.gitlab.com/ee/user/project/deploy_tokens/
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/db18993f652425b72c4b854e18a002e0ec44b196
 milestone: '10.7'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/deployment_clusters.yml b/db/docs/deployment_clusters.yml
index 1c1a5af1009..7212b4b0a0e 100644
--- a/db/docs/deployment_clusters.yml
+++ b/db/docs/deployment_clusters.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 exempt_from_sharding: true
 notes: Exempted because Table is scheduled for removal
+table_size: small
diff --git a/db/docs/design_management_designs.yml b/db/docs/design_management_designs.yml
index b37301a7f44..b8bac5925a9 100644
--- a/db/docs/design_management_designs.yml
+++ b/db/docs/design_management_designs.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: project
 desired_sharding_key_migration_job_name: BackfillDesignManagementDesignsNamespaceId
+table_size: small
diff --git a/db/docs/design_management_designs_versions.yml b/db/docs/design_management_designs_versions.yml
index d62c503b92a..ac69f64bcd7 100644
--- a/db/docs/design_management_designs_versions.yml
+++ b/db/docs/design_management_designs_versions.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: design
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/design_management_repositories.yml b/db/docs/design_management_repositories.yml
index 86ce11852fa..3cb74766896 100644
--- a/db/docs/design_management_repositories.yml
+++ b/db/docs/design_management_repositories.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: project
 desired_sharding_key_migration_job_name: BackfillDesignManagementRepositoriesNamespaceId
+table_size: small
diff --git a/db/docs/design_management_versions.yml b/db/docs/design_management_versions.yml
index 04ca8edfcd7..e7cb5f82382 100644
--- a/db/docs/design_management_versions.yml
+++ b/db/docs/design_management_versions.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: issue
 desired_sharding_key_migration_job_name: BackfillDesignManagementVersionsNamespaceId
+table_size: small
diff --git a/db/docs/dora_daily_metrics.yml b/db/docs/dora_daily_metrics.yml
index 494f7c45848..e2ce79ea93a 100644
--- a/db/docs/dora_daily_metrics.yml
+++ b/db/docs/dora_daily_metrics.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: environment
 desired_sharding_key_migration_job_name: BackfillDoraDailyMetricsProjectId
+table_size: small
diff --git a/db/docs/dora_performance_scores.yml b/db/docs/dora_performance_scores.yml
index fb2b889164d..51458908b56 100644
--- a/db/docs/dora_performance_scores.yml
+++ b/db/docs/dora_performance_scores.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/draft_notes.yml b/db/docs/draft_notes.yml
index e11e8889672..8c79fb26180 100644
--- a/db/docs/draft_notes.yml
+++ b/db/docs/draft_notes.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: target_project_id
         belongs_to: merge_request
 desired_sharding_key_migration_job_name: BackfillDraftNotesProjectId
+table_size: small
diff --git a/db/docs/emails.yml b/db/docs/emails.yml
index 7ac36fcfc2a..346d2db686b 100644
--- a/db/docs/emails.yml
+++ b/db/docs/emails.yml
@@ -12,3 +12,4 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_emails_on_email_trigram
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152249
+table_size: small
diff --git a/db/docs/environments.yml b/db/docs/environments.yml
index f3bf1385879..91557014e7a 100644
--- a/db/docs/environments.yml
+++ b/db/docs/environments.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/epic_issues.yml b/db/docs/epic_issues.yml
index c4b599d1c67..b7c0f289e9d 100644
--- a/db/docs/epic_issues.yml
+++ b/db/docs/epic_issues.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: issue
 desired_sharding_key_migration_job_name: BackfillEpicIssuesNamespaceId
+table_size: small
diff --git a/db/docs/epics.yml b/db/docs/epics.yml
index 0e7ac5d3f63..5c4763b6b20 100644
--- a/db/docs/epics.yml
+++ b/db/docs/epics.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/evidences.yml b/db/docs/evidences.yml
index b7eb53baec0..dfdc4c7c597 100644
--- a/db/docs/evidences.yml
+++ b/db/docs/evidences.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: release
 desired_sharding_key_migration_job_name: BackfillEvidencesProjectId
+table_size: small
diff --git a/db/docs/external_pull_requests.yml b/db/docs/external_pull_requests.yml
index 94fb5b318ae..d55bcb4ba05 100644
--- a/db/docs/external_pull_requests.yml
+++ b/db/docs/external_pull_requests.yml
@@ -10,3 +10,4 @@ milestone: '12.3'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/fork_network_members.yml b/db/docs/fork_network_members.yml
index 718d7bf8ca7..d5469523e1e 100644
--- a/db/docs/fork_network_members.yml
+++ b/db/docs/fork_network_members.yml
@@ -10,3 +10,4 @@ milestone: '10.1'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/geo_event_log.yml b/db/docs/geo_event_log.yml
index f605a267c1f..93570409a55 100644
--- a/db/docs/geo_event_log.yml
+++ b/db/docs/geo_event_log.yml
@@ -12,3 +12,4 @@ gitlab_schema: gitlab_main_cell
 exempt_from_sharding: true
 notes: This table is a log of all events that occur on a primary Geo node/site, which
   a secondary might be interested in.
+table_size: small
diff --git a/db/docs/geo_events.yml b/db/docs/geo_events.yml
index 5b3c772671d..7d03f6ef79d 100644
--- a/db/docs/geo_events.yml
+++ b/db/docs/geo_events.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23447
 milestone: '12.8'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/464440
+table_size: small
diff --git a/db/docs/gitlab_subscription_histories.yml b/db/docs/gitlab_subscription_histories.yml
index 0ab70b8f1e8..8c8c1e9f696 100644
--- a/db/docs/gitlab_subscription_histories.yml
+++ b/db/docs/gitlab_subscription_histories.yml
@@ -10,3 +10,4 @@ milestone: '12.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/gitlab_subscriptions.yml b/db/docs/gitlab_subscriptions.yml
index cfa034b4a13..96d76706a2c 100644
--- a/db/docs/gitlab_subscriptions.yml
+++ b/db/docs/gitlab_subscriptions.yml
@@ -10,3 +10,4 @@ milestone: '11.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/gpg_keys.yml b/db/docs/gpg_keys.yml
index 677adbb5585..59d91fae4f2 100644
--- a/db/docs/gpg_keys.yml
+++ b/db/docs/gpg_keys.yml
@@ -8,3 +8,4 @@ description: Stores GPG keys
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546
 milestone: '9.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/group_audit_events.yml b/db/docs/group_audit_events.yml
index e4731fd3053..913f03d6f01 100644
--- a/db/docs/group_audit_events.yml
+++ b/db/docs/group_audit_events.yml
@@ -10,3 +10,4 @@ milestone: '17.1'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/group_features.yml b/db/docs/group_features.yml
index 0081fac356e..55677b9abe2 100644
--- a/db/docs/group_features.yml
+++ b/db/docs/group_features.yml
@@ -10,3 +10,4 @@ milestone: '14.10'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   group_id: namespaces
+table_size: small
diff --git a/db/docs/groups_visits.yml b/db/docs/groups_visits.yml
index 43d605e6572..aaea056639b 100644
--- a/db/docs/groups_visits.yml
+++ b/db/docs/groups_visits.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   entity_id: namespaces
+table_size: small
diff --git a/db/docs/identities.yml b/db/docs/identities.yml
index 7c917c5eabf..605730de9ab 100644
--- a/db/docs/identities.yml
+++ b/db/docs/identities.yml
@@ -8,3 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1a80d13a3990937580c97e2b0ba8fb98f69bc055
 milestone: '7.6'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/import_export_uploads.yml b/db/docs/import_export_uploads.yml
index cf7d427c139..75c2ef7f066 100644
--- a/db/docs/import_export_uploads.yml
+++ b/db/docs/import_export_uploads.yml
@@ -12,3 +12,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   group_id: namespaces
+table_size: small
diff --git a/db/docs/import_failures.yml b/db/docs/import_failures.yml
index d042f86b3f1..def54568a2b 100644
--- a/db/docs/import_failures.yml
+++ b/db/docs/import_failures.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20727
 milestone: '12.6'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463854
+table_size: small
diff --git a/db/docs/incident_management_timeline_events.yml b/db/docs/incident_management_timeline_events.yml
index 66113cac181..cb2cf1694a4 100644
--- a/db/docs/incident_management_timeline_events.yml
+++ b/db/docs/incident_management_timeline_events.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/index_statuses.yml b/db/docs/index_statuses.yml
index 548168557ad..536637525e7 100644
--- a/db/docs/index_statuses.yml
+++ b/db/docs/index_statuses.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/instance_audit_events.yml b/db/docs/instance_audit_events.yml
index 5a58eacac1e..1b147783999 100644
--- a/db/docs/instance_audit_events.yml
+++ b/db/docs/instance_audit_events.yml
@@ -8,3 +8,4 @@ description: Stores audit events scoped to instance
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152035/
 milestone: '17.1'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/integrations.yml b/db/docs/integrations.yml
index 4be931202e9..c2b01f9a16b 100644
--- a/db/docs/integrations.yml
+++ b/db/docs/integrations.yml
@@ -68,3 +68,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64562
 milestone: '9.4'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463856
+table_size: small
diff --git a/db/docs/internal_ids.yml b/db/docs/internal_ids.yml
index 37264794cdb..1472ff4cba4 100644
--- a/db/docs/internal_ids.yml
+++ b/db/docs/internal_ids.yml
@@ -12,3 +12,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/issue_assignees.yml b/db/docs/issue_assignees.yml
index a96076c6549..283cf84b56a 100644
--- a/db/docs/issue_assignees.yml
+++ b/db/docs/issue_assignees.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/issue_assignment_events.yml b/db/docs/issue_assignment_events.yml
index f4a8aac898e..bf6591b3fa4 100644
--- a/db/docs/issue_assignment_events.yml
+++ b/db/docs/issue_assignment_events.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/issue_email_participants.yml b/db/docs/issue_email_participants.yml
index 297fb93edeb..b02a9491ea3 100644
--- a/db/docs/issue_email_participants.yml
+++ b/db/docs/issue_email_participants.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/issue_emails.yml b/db/docs/issue_emails.yml
index b468023f00a..7ce8f6d1d20 100644
--- a/db/docs/issue_emails.yml
+++ b/db/docs/issue_emails.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/issue_links.yml b/db/docs/issue_links.yml
index 965a905510d..83b8dae56ff 100644
--- a/db/docs/issue_links.yml
+++ b/db/docs/issue_links.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: source
 desired_sharding_key_migration_job_name: BackfillIssueLinksNamespaceId
+table_size: small
diff --git a/db/docs/issue_metrics.yml b/db/docs/issue_metrics.yml
index 8fc3f60cbb9..158dffc13c4 100644
--- a/db/docs/issue_metrics.yml
+++ b/db/docs/issue_metrics.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/issue_user_mentions.yml b/db/docs/issue_user_mentions.yml
index ae066ed072b..6b247d6aa66 100644
--- a/db/docs/issue_user_mentions.yml
+++ b/db/docs/issue_user_mentions.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/jira_tracker_data.yml b/db/docs/jira_tracker_data.yml
index fef7d6c35db..21124c2ba3a 100644
--- a/db/docs/jira_tracker_data.yml
+++ b/db/docs/jira_tracker_data.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1f332ae8da99450
 milestone: '12.0'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463856
+table_size: small
diff --git a/db/docs/keys.yml b/db/docs/keys.yml
index 0a0131a9ddf..58becf8b34a 100644
--- a/db/docs/keys.yml
+++ b/db/docs/keys.yml
@@ -11,3 +11,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
diff --git a/db/docs/labels.yml b/db/docs/labels.yml
index 3744cf561e2..5acc93de5b4 100644
--- a/db/docs/labels.yml
+++ b/db/docs/labels.yml
@@ -14,3 +14,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   group_id: namespaces
+table_size: small
diff --git a/db/docs/list_user_preferences.yml b/db/docs/list_user_preferences.yml
index 8a57a5ed2ab..cac56a086d5 100644
--- a/db/docs/list_user_preferences.yml
+++ b/db/docs/list_user_preferences.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/15657
 milestone: '12.3'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/lists.yml b/db/docs/lists.yml
index 6ea6f787907..247a67b0462 100644
--- a/db/docs/lists.yml
+++ b/db/docs/lists.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/611dab2e522e5e5
 milestone: '8.11'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/loose_foreign_keys_deleted_records.yml b/db/docs/loose_foreign_keys_deleted_records.yml
index b064eedad87..bd55c604eae 100644
--- a/db/docs/loose_foreign_keys_deleted_records.yml
+++ b/db/docs/loose_foreign_keys_deleted_records.yml
@@ -9,3 +9,4 @@ description: Used by the loose foreign keys feature as a queue of parent records
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70152
 milestone: '14.3'
 gitlab_schema: gitlab_shared
+table_size: small
diff --git a/db/docs/merge_request_assignment_events.yml b/db/docs/merge_request_assignment_events.yml
index 3d1a1ce14b9..4ab01f6604c 100644
--- a/db/docs/merge_request_assignment_events.yml
+++ b/db/docs/merge_request_assignment_events.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: target_project_id
         belongs_to: merge_request
 desired_sharding_key_migration_job_name: BackfillMergeRequestAssignmentEventsProjectId
+table_size: small
diff --git a/db/docs/merge_request_context_commit_diff_files.yml b/db/docs/merge_request_context_commit_diff_files.yml
index 3d7bb85e2f9..8fd7f24f630 100644
--- a/db/docs/merge_request_context_commit_diff_files.yml
+++ b/db/docs/merge_request_context_commit_diff_files.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: merge_request_context_commit
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/merge_request_diff_commit_users.yml b/db/docs/merge_request_diff_commit_users.yml
index 5d5b09a4d31..e45e1061bac 100644
--- a/db/docs/merge_request_diff_commit_users.yml
+++ b/db/docs/merge_request_diff_commit_users.yml
@@ -8,3 +8,4 @@ description: Store commit user information for merge request diffs
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63669
 milestone: '14.1'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/merge_request_diff_details.yml b/db/docs/merge_request_diff_details.yml
index 54ff6987979..df96d362936 100644
--- a/db/docs/merge_request_diff_details.yml
+++ b/db/docs/merge_request_diff_details.yml
@@ -17,3 +17,4 @@ desired_sharding_key:
         table: merge_request_diffs
         sharding_key: project_id
         belongs_to: merge_request_diff
+table_size: small
diff --git a/db/docs/merge_request_predictions.yml b/db/docs/merge_request_predictions.yml
index d772b91ac8b..5c2616bcd9c 100644
--- a/db/docs/merge_request_predictions.yml
+++ b/db/docs/merge_request_predictions.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: merge_requests
         sharding_key: target_project_id
         belongs_to: merge_request
+table_size: small
diff --git a/db/docs/merge_requests_closing_issues.yml b/db/docs/merge_requests_closing_issues.yml
index 57df2c5e8ff..5e1d02f132d 100644
--- a/db/docs/merge_requests_closing_issues.yml
+++ b/db/docs/merge_requests_closing_issues.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: target_project_id
         belongs_to: merge_request
 desired_sharding_key_migration_job_name: BackfillMergeRequestsClosingIssuesProjectId
+table_size: small
diff --git a/db/docs/merge_requests_compliance_violations.yml b/db/docs/merge_requests_compliance_violations.yml
index e53668b9c99..169e549a51c 100644
--- a/db/docs/merge_requests_compliance_violations.yml
+++ b/db/docs/merge_requests_compliance_violations.yml
@@ -11,3 +11,4 @@ gitlab_schema: gitlab_main_cell
 allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/464719
+table_size: small
diff --git a/db/docs/merge_trains.yml b/db/docs/merge_trains.yml
index f6d5363f9d4..15aeb28ce14 100644
--- a/db/docs/merge_trains.yml
+++ b/db/docs/merge_trains.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   target_project_id: projects
+table_size: small
diff --git a/db/docs/milestones.yml b/db/docs/milestones.yml
index 9e109f02aa8..992e50d46cf 100644
--- a/db/docs/milestones.yml
+++ b/db/docs/milestones.yml
@@ -14,3 +14,4 @@ allow_cross_foreign_keys:
 sharding_key:
   project_id: projects
   group_id: namespaces
+table_size: small
diff --git a/db/docs/ml_candidate_metrics.yml b/db/docs/ml_candidate_metrics.yml
index 9799d0e5afc..e9b15df48eb 100644
--- a/db/docs/ml_candidate_metrics.yml
+++ b/db/docs/ml_candidate_metrics.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: candidate
 desired_sharding_key_migration_job_name: BackfillMlCandidateMetricsProjectId
+table_size: small
diff --git a/db/docs/namespace_details.yml b/db/docs/namespace_details.yml
index 2027a8c9df9..5040cfe9e15 100644
--- a/db/docs/namespace_details.yml
+++ b/db/docs/namespace_details.yml
@@ -10,3 +10,4 @@ milestone: '15.3'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/namespace_ldap_settings.yml b/db/docs/namespace_ldap_settings.yml
index 969425d06f9..04de4b8acd3 100644
--- a/db/docs/namespace_ldap_settings.yml
+++ b/db/docs/namespace_ldap_settings.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/namespace_root_storage_statistics.yml b/db/docs/namespace_root_storage_statistics.yml
index fa50a7ec215..759a00c3132 100644
--- a/db/docs/namespace_root_storage_statistics.yml
+++ b/db/docs/namespace_root_storage_statistics.yml
@@ -11,3 +11,4 @@ milestone: '12.1'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/namespace_settings.yml b/db/docs/namespace_settings.yml
index 38e9852ea3f..cfa4f3b3bdf 100644
--- a/db/docs/namespace_settings.yml
+++ b/db/docs/namespace_settings.yml
@@ -10,3 +10,4 @@ milestone: '13.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/notification_settings.yml b/db/docs/notification_settings.yml
index 225be653455..14f18b9f791 100644
--- a/db/docs/notification_settings.yml
+++ b/db/docs/notification_settings.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/31b0e53015e38e5
 milestone: '8.7'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/onboarding_progresses.yml b/db/docs/onboarding_progresses.yml
index 609c6b0692a..97367a70111 100644
--- a/db/docs/onboarding_progresses.yml
+++ b/db/docs/onboarding_progresses.yml
@@ -11,3 +11,4 @@ milestone: '13.8'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/operations_feature_flags_clients.yml b/db/docs/operations_feature_flags_clients.yml
index b84cc73c06f..1babac01576 100644
--- a/db/docs/operations_feature_flags_clients.yml
+++ b/db/docs/operations_feature_flags_clients.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/organization_details.yml b/db/docs/organization_details.yml
index 75590ed21ed..5df90f277dd 100644
--- a/db/docs/organization_details.yml
+++ b/db/docs/organization_details.yml
@@ -7,4 +7,6 @@ feature_categories:
 description: Detail about an organization
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137616
 milestone: '16.7'
-gitlab_schema: gitlab_main_clusterwide
+gitlab_schema: gitlab_main_cell
+sharding_key:
+  organization_id: organizations
diff --git a/db/docs/organization_users.yml b/db/docs/organization_users.yml
index fbe613272d3..ca16bdce8a8 100644
--- a/db/docs/organization_users.yml
+++ b/db/docs/organization_users.yml
@@ -10,3 +10,4 @@ milestone: '16.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   organization_id: organizations
+table_size: small
diff --git a/db/docs/organizations.yml b/db/docs/organizations.yml
index c0e4697fb37..f58e6887d2d 100644
--- a/db/docs/organizations.yml
+++ b/db/docs/organizations.yml
@@ -7,4 +7,6 @@ feature_categories:
 description: Define ownership of namespaces, projects, and users by organizations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119421
 milestone: '16.0'
-gitlab_schema: gitlab_main_clusterwide
+gitlab_schema: gitlab_main_cell
+sharding_key:
+  id: organizations
diff --git a/db/docs/p_ci_finished_build_ch_sync_events.yml b/db/docs/p_ci_finished_build_ch_sync_events.yml
index 66fcb6f17f1..24029bda144 100644
--- a/db/docs/p_ci_finished_build_ch_sync_events.yml
+++ b/db/docs/p_ci_finished_build_ch_sync_events.yml
@@ -10,3 +10,4 @@ milestone: '16.5'
 gitlab_schema: gitlab_ci
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/packages_build_infos.yml b/db/docs/packages_build_infos.yml
index 44e60582943..a78e85edf7f 100644
--- a/db/docs/packages_build_infos.yml
+++ b/db/docs/packages_build_infos.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesBuildInfosProjectId
+table_size: small
diff --git a/db/docs/packages_composer_metadata.yml b/db/docs/packages_composer_metadata.yml
index 750343133a2..51711d1331d 100644
--- a/db/docs/packages_composer_metadata.yml
+++ b/db/docs/packages_composer_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesComposerMetadataProjectId
+table_size: small
diff --git a/db/docs/packages_conan_file_metadata.yml b/db/docs/packages_conan_file_metadata.yml
index 0b8530552fa..9959ce335d5 100644
--- a/db/docs/packages_conan_file_metadata.yml
+++ b/db/docs/packages_conan_file_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package_file
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/packages_dependencies.yml b/db/docs/packages_dependencies.yml
index d35dedaca0d..884c47b1c97 100644
--- a/db/docs/packages_dependencies.yml
+++ b/db/docs/packages_dependencies.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/packages_helm_file_metadata.yml b/db/docs/packages_helm_file_metadata.yml
index dc425ea7a98..0095b537f98 100644
--- a/db/docs/packages_helm_file_metadata.yml
+++ b/db/docs/packages_helm_file_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package_file
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/packages_maven_metadata.yml b/db/docs/packages_maven_metadata.yml
index c83801f54f1..f87413cc89e 100644
--- a/db/docs/packages_maven_metadata.yml
+++ b/db/docs/packages_maven_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesMavenMetadataProjectId
+table_size: small
diff --git a/db/docs/packages_npm_metadata.yml b/db/docs/packages_npm_metadata.yml
index 98bb468d96f..1538cf779c6 100644
--- a/db/docs/packages_npm_metadata.yml
+++ b/db/docs/packages_npm_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesNpmMetadataProjectId
+table_size: small
diff --git a/db/docs/packages_nuget_dependency_link_metadata.yml b/db/docs/packages_nuget_dependency_link_metadata.yml
index 1744555791c..a28e6ac6ef6 100644
--- a/db/docs/packages_nuget_dependency_link_metadata.yml
+++ b/db/docs/packages_nuget_dependency_link_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: dependency_link
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/packages_nuget_metadata.yml b/db/docs/packages_nuget_metadata.yml
index 28f64be6041..ad50397ab15 100644
--- a/db/docs/packages_nuget_metadata.yml
+++ b/db/docs/packages_nuget_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesNugetMetadataProjectId
+table_size: small
diff --git a/db/docs/packages_nuget_symbols.yml b/db/docs/packages_nuget_symbols.yml
index f79af9e08c4..9ea1ab99be3 100644
--- a/db/docs/packages_nuget_symbols.yml
+++ b/db/docs/packages_nuget_symbols.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesNugetSymbolsProjectId
+table_size: small
diff --git a/db/docs/packages_package_file_build_infos.yml b/db/docs/packages_package_file_build_infos.yml
index e5bdbbf2319..cc65652ce13 100644
--- a/db/docs/packages_package_file_build_infos.yml
+++ b/db/docs/packages_package_file_build_infos.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package_file
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/packages_pypi_metadata.yml b/db/docs/packages_pypi_metadata.yml
index 1304012e0b3..7e27cd9f2ea 100644
--- a/db/docs/packages_pypi_metadata.yml
+++ b/db/docs/packages_pypi_metadata.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: package
 desired_sharding_key_migration_job_name: BackfillPackagesPypiMetadataProjectId
+table_size: small
diff --git a/db/docs/packages_tags.yml b/db/docs/packages_tags.yml
index b5937dc81ef..c4b788e85ee 100644
--- a/db/docs/packages_tags.yml
+++ b/db/docs/packages_tags.yml
@@ -12,3 +12,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
 desired_sharding_key_migration_job_name: BackfillPackagesTagsProjectId
+table_size: small
diff --git a/db/docs/packages_terraform_module_metadata.yml b/db/docs/packages_terraform_module_metadata.yml
index 0874d671b38..7f6b6c35497 100644
--- a/db/docs/packages_terraform_module_metadata.yml
+++ b/db/docs/packages_terraform_module_metadata.yml
@@ -10,3 +10,4 @@ milestone: '16.9'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/pages_deployments.yml b/db/docs/pages_deployments.yml
index 66fa9de9815..2ba29fde209 100644
--- a/db/docs/pages_deployments.yml
+++ b/db/docs/pages_deployments.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/pages_domains.yml b/db/docs/pages_domains.yml
index 45a4bcbdb9e..791780f6ff4 100644
--- a/db/docs/pages_domains.yml
+++ b/db/docs/pages_domains.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/pm_advisories.yml b/db/docs/pm_advisories.yml
index 010f029978e..90b5cb0dbde 100644
--- a/db/docs/pm_advisories.yml
+++ b/db/docs/pm_advisories.yml
@@ -9,3 +9,4 @@ description: Stores security advisories.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117326
 milestone: '16.0'
 gitlab_schema: gitlab_pm
+table_size: small
diff --git a/db/docs/pm_affected_packages.yml b/db/docs/pm_affected_packages.yml
index ad389c72b59..67711c0dcec 100644
--- a/db/docs/pm_affected_packages.yml
+++ b/db/docs/pm_affected_packages.yml
@@ -9,3 +9,4 @@ description: Stores info for packages affected by an advisory.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117326
 milestone: '16.0'
 gitlab_schema: gitlab_pm
+table_size: small
diff --git a/db/docs/pm_packages.yml b/db/docs/pm_packages.yml
index b114e75791f..45877118894 100644
--- a/db/docs/pm_packages.yml
+++ b/db/docs/pm_packages.yml
@@ -8,3 +8,4 @@ description: Tracks packages 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
diff --git a/db/docs/project_auto_devops.yml b/db/docs/project_auto_devops.yml
index 000a50ebb22..068c6771662 100644
--- a/db/docs/project_auto_devops.yml
+++ b/db/docs/project_auto_devops.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_ci_cd_settings.yml b/db/docs/project_ci_cd_settings.yml
index e94039923c6..330f5763782 100644
--- a/db/docs/project_ci_cd_settings.yml
+++ b/db/docs/project_ci_cd_settings.yml
@@ -12,3 +12,4 @@ milestone: '10.8'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_compliance_standards_adherence.yml b/db/docs/project_compliance_standards_adherence.yml
index 0eae8b3fbb6..3e31ec72338 100644
--- a/db/docs/project_compliance_standards_adherence.yml
+++ b/db/docs/project_compliance_standards_adherence.yml
@@ -10,3 +10,4 @@ milestone: '16.1'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_custom_attributes.yml b/db/docs/project_custom_attributes.yml
index 4f44cfa6b22..7f3be893576 100644
--- a/db/docs/project_custom_attributes.yml
+++ b/db/docs/project_custom_attributes.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_deploy_tokens.yml b/db/docs/project_deploy_tokens.yml
index 8b51928c8ab..13456949cc7 100644
--- a/db/docs/project_deploy_tokens.yml
+++ b/db/docs/project_deploy_tokens.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_export_jobs.yml b/db/docs/project_export_jobs.yml
index adbe88484fc..903b3d3bb40 100644
--- a/db/docs/project_export_jobs.yml
+++ b/db/docs/project_export_jobs.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_import_data.yml b/db/docs/project_import_data.yml
index 5b03a0d9637..68b435bb8c3 100644
--- a/db/docs/project_import_data.yml
+++ b/db/docs/project_import_data.yml
@@ -11,3 +11,4 @@ milestone: '7.10'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_mirror_data.yml b/db/docs/project_mirror_data.yml
index a95447b9a95..f3ad1a4eacf 100644
--- a/db/docs/project_mirror_data.yml
+++ b/db/docs/project_mirror_data.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_pages_metadata.yml b/db/docs/project_pages_metadata.yml
index 3db3d0a6c96..8990aa247c5 100644
--- a/db/docs/project_pages_metadata.yml
+++ b/db/docs/project_pages_metadata.yml
@@ -10,3 +10,4 @@ milestone: '12.4'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_relation_export_uploads.yml b/db/docs/project_relation_export_uploads.yml
index ca87c044e85..cd3411da2e2 100644
--- a/db/docs/project_relation_export_uploads.yml
+++ b/db/docs/project_relation_export_uploads.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: relation_export
     awaiting_backfill_on_parent: true
+table_size: small
diff --git a/db/docs/project_relation_exports.yml b/db/docs/project_relation_exports.yml
index 0e994abdd6c..cf3f3703d82 100644
--- a/db/docs/project_relation_exports.yml
+++ b/db/docs/project_relation_exports.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: project_export_job
 desired_sharding_key_migration_job_name: BackfillProjectRelationExportsProjectId
+table_size: small
diff --git a/db/docs/project_repository_storage_moves.yml b/db/docs/project_repository_storage_moves.yml
index edd4f658872..c4ec9b31da0 100644
--- a/db/docs/project_repository_storage_moves.yml
+++ b/db/docs/project_repository_storage_moves.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_security_settings.yml b/db/docs/project_security_settings.yml
index 4c89af4036e..1e9d5bdbde8 100644
--- a/db/docs/project_security_settings.yml
+++ b/db/docs/project_security_settings.yml
@@ -11,3 +11,4 @@ milestone: '13.1'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_settings.yml b/db/docs/project_settings.yml
index 10bb792b44b..44aa7443af1 100644
--- a/db/docs/project_settings.yml
+++ b/db/docs/project_settings.yml
@@ -10,3 +10,4 @@ milestone: '10.8'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_statistics.yml b/db/docs/project_statistics.yml
index 5ac2be594ac..75b8fc6ac35 100644
--- a/db/docs/project_statistics.yml
+++ b/db/docs/project_statistics.yml
@@ -23,3 +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
diff --git a/db/docs/project_topics.yml b/db/docs/project_topics.yml
index 7ec511cb3c7..9007709f185 100644
--- a/db/docs/project_topics.yml
+++ b/db/docs/project_topics.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/project_wiki_repositories.yml b/db/docs/project_wiki_repositories.yml
index 72a14c4feab..8837a09086b 100644
--- a/db/docs/project_wiki_repositories.yml
+++ b/db/docs/project_wiki_repositories.yml
@@ -10,3 +10,4 @@ milestone: '15.6'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/projects_visits.yml b/db/docs/projects_visits.yml
index be065f3191e..815482004aa 100644
--- a/db/docs/projects_visits.yml
+++ b/db/docs/projects_visits.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   entity_id: projects
+table_size: small
diff --git a/db/docs/protected_branch_merge_access_levels.yml b/db/docs/protected_branch_merge_access_levels.yml
index 2ab9e779349..16f8f7259aa 100644
--- a/db/docs/protected_branch_merge_access_levels.yml
+++ b/db/docs/protected_branch_merge_access_levels.yml
@@ -27,3 +27,4 @@ desired_sharding_key:
         table: protected_branches
         sharding_key: namespace_id
         belongs_to: protected_branch
+table_size: small
diff --git a/db/docs/protected_branch_push_access_levels.yml b/db/docs/protected_branch_push_access_levels.yml
index 49cc7271056..2a146bcd5cc 100644
--- a/db/docs/protected_branch_push_access_levels.yml
+++ b/db/docs/protected_branch_push_access_levels.yml
@@ -27,3 +27,4 @@ desired_sharding_key:
         table: protected_branches
         sharding_key: namespace_id
         belongs_to: protected_branch
+table_size: small
diff --git a/db/docs/protected_branch_unprotect_access_levels.yml b/db/docs/protected_branch_unprotect_access_levels.yml
index 9c49ab7f26f..e1c14bee25b 100644
--- a/db/docs/protected_branch_unprotect_access_levels.yml
+++ b/db/docs/protected_branch_unprotect_access_levels.yml
@@ -27,3 +27,4 @@ desired_sharding_key:
         table: protected_branches
         sharding_key: namespace_id
         belongs_to: protected_branch
+table_size: small
diff --git a/db/docs/protected_branches.yml b/db/docs/protected_branches.yml
index d4b5a6a6ee0..d1c8b66672f 100644
--- a/db/docs/protected_branches.yml
+++ b/db/docs/protected_branches.yml
@@ -12,3 +12,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/protected_tag_create_access_levels.yml b/db/docs/protected_tag_create_access_levels.yml
index a4cfe2a28c8..8ea1e0a5b85 100644
--- a/db/docs/protected_tag_create_access_levels.yml
+++ b/db/docs/protected_tag_create_access_levels.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: protected_tag
 desired_sharding_key_migration_job_name: BackfillProtectedTagCreateAccessLevelsProjectId
+table_size: small
diff --git a/db/docs/push_rules.yml b/db/docs/push_rules.yml
index 112defaa237..8b9d9407fd3 100644
--- a/db/docs/push_rules.yml
+++ b/db/docs/push_rules.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1b98b5ab97ce3e9
 milestone: '8.10'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490488
+table_size: small
diff --git a/db/docs/redirect_routes.yml b/db/docs/redirect_routes.yml
index 9296329f8ae..6a3d738d9b7 100644
--- a/db/docs/redirect_routes.yml
+++ b/db/docs/redirect_routes.yml
@@ -8,3 +8,4 @@ description: Stores routes for redirect after changing the path to group or proj
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11136
 milestone: '9.2'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/release_links.yml b/db/docs/release_links.yml
index 72bcf2f1ff6..d3b7f948da5 100644
--- a/db/docs/release_links.yml
+++ b/db/docs/release_links.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: release
 desired_sharding_key_migration_job_name: BackfillReleaseLinksProjectId
+table_size: small
diff --git a/db/docs/remote_mirrors.yml b/db/docs/remote_mirrors.yml
index c49712e4d36..8506eae5876 100644
--- a/db/docs/remote_mirrors.yml
+++ b/db/docs/remote_mirrors.yml
@@ -10,3 +10,4 @@ milestone: '8.7'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/repository_languages.yml b/db/docs/repository_languages.yml
index 40e1c4a0ae5..d4b9c6440b9 100644
--- a/db/docs/repository_languages.yml
+++ b/db/docs/repository_languages.yml
@@ -10,3 +10,4 @@ milestone: '11.2'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/resource_iteration_events.yml b/db/docs/resource_iteration_events.yml
index 8783baa1668..ca8851646ef 100644
--- a/db/docs/resource_iteration_events.yml
+++ b/db/docs/resource_iteration_events.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37617
 milestone: '13.3'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/resource_milestone_events.yml b/db/docs/resource_milestone_events.yml
index 15f9a56b7d4..50321c59945 100644
--- a/db/docs/resource_milestone_events.yml
+++ b/db/docs/resource_milestone_events.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23965
 milestone: '12.8'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/resource_weight_events.yml b/db/docs/resource_weight_events.yml
index c6c9a229032..81c3f6c880a 100644
--- a/db/docs/resource_weight_events.yml
+++ b/db/docs/resource_weight_events.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+table_size: small
diff --git a/db/docs/reviews.yml b/db/docs/reviews.yml
index 41908a57c96..c469c521823 100644
--- a/db/docs/reviews.yml
+++ b/db/docs/reviews.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/sbom_component_versions.yml b/db/docs/sbom_component_versions.yml
index 9a0cbc0d1e4..635b28b665b 100644
--- a/db/docs/sbom_component_versions.yml
+++ b/db/docs/sbom_component_versions.yml
@@ -11,3 +11,4 @@ milestone: '15.2'
 gitlab_schema: gitlab_sec
 sharding_key:
   organization_id: organizations
+table_size: small
diff --git a/db/docs/sbom_components.yml b/db/docs/sbom_components.yml
index 0de00a21a34..0c956081b8f 100644
--- a/db/docs/sbom_components.yml
+++ b/db/docs/sbom_components.yml
@@ -11,3 +11,4 @@ milestone: '15.2'
 gitlab_schema: gitlab_sec
 sharding_key:
   organization_id: organizations
+table_size: small
diff --git a/db/docs/sbom_occurrences_vulnerabilities.yml b/db/docs/sbom_occurrences_vulnerabilities.yml
index a3b564a7cca..f052ca3c0ef 100644
--- a/db/docs/sbom_occurrences_vulnerabilities.yml
+++ b/db/docs/sbom_occurrences_vulnerabilities.yml
@@ -16,3 +16,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: occurrence
 desired_sharding_key_migration_job_name: BackfillSbomOccurrencesVulnerabilitiesProjectId
+table_size: small
diff --git a/db/docs/sbom_sources.yml b/db/docs/sbom_sources.yml
index abeccbcccb4..c1902a429f0 100644
--- a/db/docs/sbom_sources.yml
+++ b/db/docs/sbom_sources.yml
@@ -10,3 +10,4 @@ milestone: '15.2'
 gitlab_schema: gitlab_sec
 sharding_key:
   organization_id: organizations
+table_size: small
diff --git a/db/docs/scan_result_policies.yml b/db/docs/scan_result_policies.yml
index 23db4c14569..a5f19ac96a3 100644
--- a/db/docs/scan_result_policies.yml
+++ b/db/docs/scan_result_policies.yml
@@ -25,3 +25,4 @@ desired_sharding_key:
         table: security_orchestration_policy_configurations
         sharding_key: namespace_id
         belongs_to: security_orchestration_policy_configuration
+table_size: small
diff --git a/db/docs/scan_result_policy_violations.yml b/db/docs/scan_result_policy_violations.yml
index c4d25adc121..5a24aa3878d 100644
--- a/db/docs/scan_result_policy_violations.yml
+++ b/db/docs/scan_result_policy_violations.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/snippet_repositories.yml b/db/docs/snippet_repositories.yml
index be0da738397..c516ed6e269 100644
--- a/db/docs/snippet_repositories.yml
+++ b/db/docs/snippet_repositories.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23796
 milestone: '12.8'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490490
+table_size: small
diff --git a/db/docs/snippets.yml b/db/docs/snippets.yml
index e49947e25be..9d9e1b80746 100644
--- a/db/docs/snippets.yml
+++ b/db/docs/snippets.yml
@@ -14,3 +14,4 @@ gitlab_schema: gitlab_main_cell
 sharding_key:
   project_id: projects
   organization_id: organizations
+table_size: small
diff --git a/db/docs/software_license_policies.yml b/db/docs/software_license_policies.yml
index 0b87376f988..36fc7997aed 100644
--- a/db/docs/software_license_policies.yml
+++ b/db/docs/software_license_policies.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/spam_logs.yml b/db/docs/spam_logs.yml
index a79d0214700..cf0718e26f3 100644
--- a/db/docs/spam_logs.yml
+++ b/db/docs/spam_logs.yml
@@ -8,3 +8,4 @@ description: Logs users flagged by the Akismet anti-spam integration.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2266
 milestone: '8.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/ssh_signatures.yml b/db/docs/ssh_signatures.yml
index 967de1b47fa..83ff6022088 100644
--- a/db/docs/ssh_signatures.yml
+++ b/db/docs/ssh_signatures.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/status_check_responses.yml b/db/docs/status_check_responses.yml
index d50bb7b17b2..2e51d10e91f 100644
--- a/db/docs/status_check_responses.yml
+++ b/db/docs/status_check_responses.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: target_project_id
         belongs_to: merge_request
 desired_sharding_key_migration_job_name: BackfillStatusCheckResponsesProjectId
+table_size: small
diff --git a/db/docs/subscriptions.yml b/db/docs/subscriptions.yml
index acf00311358..e68a0571806 100644
--- a/db/docs/subscriptions.yml
+++ b/db/docs/subscriptions.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/410d25c8ca8afab
 milestone: '7.9'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/suggestions.yml b/db/docs/suggestions.yml
index 54ee4d0ebd3..51278058752 100644
--- a/db/docs/suggestions.yml
+++ b/db/docs/suggestions.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8656
 milestone: '11.6'
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444222
+table_size: small
diff --git a/db/docs/tags.yml b/db/docs/tags.yml
index 2e6f4a44a30..8e8830ccb2e 100644
--- a/db/docs/tags.yml
+++ b/db/docs/tags.yml
@@ -10,3 +10,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/b946da44695c9c8
 milestone: "<6.0"
 gitlab_schema: gitlab_ci
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/470872
+table_size: small
diff --git a/db/docs/term_agreements.yml b/db/docs/term_agreements.yml
index af1f616a08a..6231b978050 100644
--- a/db/docs/term_agreements.yml
+++ b/db/docs/term_agreements.yml
@@ -8,3 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/82eeb72c8c03727540b902d40e7e657d0a5ecb4c
 milestone: '10.8'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/terraform_state_versions.yml b/db/docs/terraform_state_versions.yml
index e9863e2c1cb..6f9ab617361 100644
--- a/db/docs/terraform_state_versions.yml
+++ b/db/docs/terraform_state_versions.yml
@@ -21,3 +21,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: terraform_state
 desired_sharding_key_migration_job_name: BackfillTerraformStateVersionsProjectId
+table_size: small
diff --git a/db/docs/timelogs.yml b/db/docs/timelogs.yml
index 87707fc599b..96f86aa8fc3 100644
--- a/db/docs/timelogs.yml
+++ b/db/docs/timelogs.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/870
 milestone: '8.14'
 gitlab_schema: gitlab_main
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463411
+table_size: small
diff --git a/db/docs/topics.yml b/db/docs/topics.yml
index 15dab56b0a7..bb595943023 100644
--- a/db/docs/topics.yml
+++ b/db/docs/topics.yml
@@ -10,3 +10,4 @@ milestone: '14.3'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   organization_id: organizations
+table_size: small
diff --git a/db/docs/user_audit_events.yml b/db/docs/user_audit_events.yml
index f71f1fbfe0a..53f6dc45191 100644
--- a/db/docs/user_audit_events.yml
+++ b/db/docs/user_audit_events.yml
@@ -8,3 +8,4 @@ description: Stores audit events scoped to user
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152035/
 milestone: '17.1'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_callouts.yml b/db/docs/user_callouts.yml
index 99746a21cd1..f6a92743ba7 100644
--- a/db/docs/user_callouts.yml
+++ b/db/docs/user_callouts.yml
@@ -8,3 +8,4 @@ description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/16735
 milestone: '10.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_custom_attributes.yml b/db/docs/user_custom_attributes.yml
index 0329d738bc9..78d8f48695b 100644
--- a/db/docs/user_custom_attributes.yml
+++ b/db/docs/user_custom_attributes.yml
@@ -8,3 +8,4 @@ description: Storing custom attributes per user
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13038
 milestone: '10.1'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_details.yml b/db/docs/user_details.yml
index e43faacc56c..3a135f4f58a 100644
--- a/db/docs/user_details.yml
+++ b/db/docs/user_details.yml
@@ -8,3 +8,4 @@ description: Stores user details
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25483
 milestone: '12.9'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_highest_roles.yml b/db/docs/user_highest_roles.yml
index cf924671dcc..27c8bc0167e 100644
--- a/db/docs/user_highest_roles.yml
+++ b/db/docs/user_highest_roles.yml
@@ -10,3 +10,4 @@ description: Stores highest role per User they have in a Group or a Project. If
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26987
 milestone: '12.9'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_phone_number_validations.yml b/db/docs/user_phone_number_validations.yml
index 1842c44235f..f0684d363f5 100644
--- a/db/docs/user_phone_number_validations.yml
+++ b/db/docs/user_phone_number_validations.yml
@@ -8,3 +8,4 @@ description: Stores whether the user has verified their phone number
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97762
 milestone: '15.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/user_preferences.yml b/db/docs/user_preferences.yml
index 5020ef97215..28901f8f299 100644
--- a/db/docs/user_preferences.yml
+++ b/db/docs/user_preferences.yml
@@ -8,3 +8,4 @@ description: Stores users' preferences
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/7816
 milestone: '11.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/users_star_projects.yml b/db/docs/users_star_projects.yml
index 973b0940f95..69a5d8fa359 100644
--- a/db/docs/users_star_projects.yml
+++ b/db/docs/users_star_projects.yml
@@ -12,3 +12,4 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/vs_code_settings.yml b/db/docs/vs_code_settings.yml
index 0e69c708720..256be285697 100644
--- a/db/docs/vs_code_settings.yml
+++ b/db/docs/vs_code_settings.yml
@@ -8,3 +8,4 @@ description: VSCode Settings
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131900
 milestone: '16.5'
 gitlab_schema: gitlab_main_clusterwide
+table_size: small
diff --git a/db/docs/vulnerability_feedback.yml b/db/docs/vulnerability_feedback.yml
index 68fb0dcacfa..12287db8ff3 100644
--- a/db/docs/vulnerability_feedback.yml
+++ b/db/docs/vulnerability_feedback.yml
@@ -11,3 +11,4 @@ milestone: '10.8'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/vulnerability_finding_evidences.yml b/db/docs/vulnerability_finding_evidences.yml
index 906cac847e1..1df93cda733 100644
--- a/db/docs/vulnerability_finding_evidences.yml
+++ b/db/docs/vulnerability_finding_evidences.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: finding
 desired_sharding_key_migration_job_name: BackfillVulnerabilityFindingEvidencesProjectId
+table_size: small
diff --git a/db/docs/vulnerability_finding_signatures.yml b/db/docs/vulnerability_finding_signatures.yml
index d93cb6e3c9a..9eb5cd827d6 100644
--- a/db/docs/vulnerability_finding_signatures.yml
+++ b/db/docs/vulnerability_finding_signatures.yml
@@ -19,3 +19,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: finding
 desired_sharding_key_migration_job_name: BackfillVulnerabilityFindingSignaturesProjectId
+table_size: small
diff --git a/db/docs/vulnerability_findings_remediations.yml b/db/docs/vulnerability_findings_remediations.yml
index 9144a522d4b..237ad27ab04 100644
--- a/db/docs/vulnerability_findings_remediations.yml
+++ b/db/docs/vulnerability_findings_remediations.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: finding
 desired_sharding_key_migration_job_name: BackfillVulnerabilityFindingsRemediationsProjectId
+table_size: small
diff --git a/db/docs/vulnerability_identifiers.yml b/db/docs/vulnerability_identifiers.yml
index 90f59f93646..add18992d2c 100644
--- a/db/docs/vulnerability_identifiers.yml
+++ b/db/docs/vulnerability_identifiers.yml
@@ -11,3 +11,4 @@ milestone: '11.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/vulnerability_issue_links.yml b/db/docs/vulnerability_issue_links.yml
index 08729973be0..97e8860c637 100644
--- a/db/docs/vulnerability_issue_links.yml
+++ b/db/docs/vulnerability_issue_links.yml
@@ -18,3 +18,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: vulnerability
 desired_sharding_key_migration_job_name: BackfillVulnerabilityIssueLinksProjectId
+table_size: small
diff --git a/db/docs/vulnerability_scanners.yml b/db/docs/vulnerability_scanners.yml
index 34f0d2d9289..34c3f279e75 100644
--- a/db/docs/vulnerability_scanners.yml
+++ b/db/docs/vulnerability_scanners.yml
@@ -10,3 +10,4 @@ milestone: '11.4'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/vulnerability_statistics.yml b/db/docs/vulnerability_statistics.yml
index fbb72f46757..b9d6875fc2b 100644
--- a/db/docs/vulnerability_statistics.yml
+++ b/db/docs/vulnerability_statistics.yml
@@ -10,3 +10,4 @@ milestone: '13.2'
 gitlab_schema: gitlab_sec
 sharding_key:
   project_id: projects
+table_size: small
diff --git a/db/docs/web_hooks.yml b/db/docs/web_hooks.yml
index 99f298fb152..87f6849af9f 100644
--- a/db/docs/web_hooks.yml
+++ b/db/docs/web_hooks.yml
@@ -13,3 +13,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/edab46e9fa5f568
 milestone: "<6.0"
 gitlab_schema: gitlab_main_cell
 sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463856
+table_size: small
diff --git a/db/docs/wiki_page_meta.yml b/db/docs/wiki_page_meta.yml
index 8470ca53526..d0c1f339894 100644
--- a/db/docs/wiki_page_meta.yml
+++ b/db/docs/wiki_page_meta.yml
@@ -13,3 +13,4 @@ allow_cross_foreign_keys:
 sharding_key:
   project_id: projects
   namespace_id: namespaces
+table_size: small
diff --git a/db/docs/wiki_page_slugs.yml b/db/docs/wiki_page_slugs.yml
index 88aa3f343d3..dad984f55bb 100644
--- a/db/docs/wiki_page_slugs.yml
+++ b/db/docs/wiki_page_slugs.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: wiki_page_meta
 desired_sharding_key_migration_job_name: BackfillWikiPageSlugsProjectId
+table_size: small
diff --git a/db/docs/wiki_repository_states.yml b/db/docs/wiki_repository_states.yml
index 1db445f411a..134f93e9b42 100644
--- a/db/docs/wiki_repository_states.yml
+++ b/db/docs/wiki_repository_states.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: project_id
         belongs_to: project_wiki_repository
 desired_sharding_key_migration_job_name: BackfillWikiRepositoryStatesProjectId
+table_size: small
diff --git a/db/docs/work_item_parent_links.yml b/db/docs/work_item_parent_links.yml
index 903e7a9798f..83caafe8573 100644
--- a/db/docs/work_item_parent_links.yml
+++ b/db/docs/work_item_parent_links.yml
@@ -20,3 +20,4 @@ desired_sharding_key:
         sharding_key: namespace_id
         belongs_to: work_item
 desired_sharding_key_migration_job_name: BackfillWorkItemParentLinksNamespaceId
+table_size: small
diff --git a/db/docs/zoekt_repositories.yml b/db/docs/zoekt_repositories.yml
index f3b10a9f7aa..22517142c3a 100644
--- a/db/docs/zoekt_repositories.yml
+++ b/db/docs/zoekt_repositories.yml
@@ -9,3 +9,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141864
 milestone: '16.9'
 gitlab_schema: gitlab_main_cell
 exempt_from_sharding: true
+table_size: small
diff --git a/db/docs/zoekt_tasks.yml b/db/docs/zoekt_tasks.yml
index 3f5aecfb5d6..1239c0c292b 100644
--- a/db/docs/zoekt_tasks.yml
+++ b/db/docs/zoekt_tasks.yml
@@ -10,3 +10,4 @@ milestone: '16.10'
 gitlab_schema: gitlab_main_cell
 sharding_key:
   project_identifier: projects
+table_size: small
diff --git a/doc/administration/settings/jira_cloud_app.md b/doc/administration/settings/jira_cloud_app.md
index df5fe2cb2c5..d3945de906b 100644
--- a/doc/administration/settings/jira_cloud_app.md
+++ b/doc/administration/settings/jira_cloud_app.md
@@ -165,6 +165,9 @@ to check if Jira Cloud is linked to:
 
 ## Install the GitLab for Jira Cloud app manually
 
+WARNING:
+In GitLab 17.5 and earlier, you might encounter installation issues when manually installing the GitLab for Jira Cloud app. For more details and resolution steps, see [issue 505372](https://gitlab.com/gitlab-org/gitlab/-/issues/505372#workaround). This does not affect [installations done from the Atlassian Marketplace](#install-the-gitlab-for-jira-cloud-app-from-the-atlassian-marketplace) or situations where the GitLab for Jira Cloud app is already installed and functioning.
+
 If you do not want to [use the official Atlassian Marketplace listing](#install-the-gitlab-for-jira-cloud-app-from-the-atlassian-marketplace),
 install the GitLab for Jira Cloud app manually.
 
diff --git a/doc/editor_extensions/img/select-project-account_v17_7.png b/doc/editor_extensions/img/select-project-account_v17_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3469a21477b38f1f4f3ee9e8088d69f51896e07
GIT binary patch
literal 20931
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
MYv`+&J+TY>FT2FY3jhEB

literal 0
HcmV?d00001

diff --git a/doc/editor_extensions/visual_studio_code/index.md b/doc/editor_extensions/visual_studio_code/index.md
index 23541e4c96e..36f3f65120b 100644
--- a/doc/editor_extensions/visual_studio_code/index.md
+++ b/doc/editor_extensions/visual_studio_code/index.md
@@ -91,6 +91,41 @@ or **Accept Next Line Of Inline Suggestion**:
    or **Accept Next Line Of Inline Suggestion**.
 1. Press <kbd>Enter</kbd> to save your changes.
 
+## Switch GitLab accounts in VS Code
+
+If you use multiple GitLab accounts (such as personal and work), the extension uses your `git remote` URL
+to determine which account to use. In some cases, the extension can't determine which account to use, and
+must ask you to select which project and account to use. This can happen:
+
+- If you have a single remote URL `git@gitlab.com:gitlab-org/gitlab-vscode-extension.git`, but two accounts for
+  `gitlab.com` (like `@sidney` and `@sidney_work`).
+- If you have a single GitLab account (for example `@sidney`), but you have multiple remotes, like:
+  - `origin`: `git@gitlab.com:gitlab-org/gitlab-vscode-extension.git`
+  - `personal-fork`: `git@gitlab.com:myusername/gitlab-vscode-extension.git`
+
+In these cases, the extension adds a **(multiple projects)** label to show you must choose an account.
+To select an account:
+
+1. On the vertical menu bar, select **GitLab Workflow** (**{tanuki}**) to display the extension sidebar.
+1. Expand **Issues and Merge Requests**.
+1. Select the line containing **(multiple projects)** to expand the list of accounts.
+1. Select the option you want to use:
+   ![select project-account combination](../img/select-project-account_v17_7.png)
+
+The **Issues and Merge requests** list updates with your information.
+
+### Change your selection
+
+To change your account selection for a project:
+
+1. On the vertical menu bar, select **GitLab Workflow** (**{tanuki}**) to display the extension sidebar.
+1. Expand **Issues and Merge Requests** to show the project list.
+1. Right-click the project's name, and select  **Clear selected project**.
+
+## Use slash commands
+
+Issues and merge requests support [GitLab slash commands](../../user/project/integrations/gitlab_slack_application.md#slash-commands) to perform actions directly in VS Code.
+
 ## Create a snippet
 
 Create a [snippet](../../user/snippets.md) to store and share bits of code and text with other users.
@@ -182,7 +217,7 @@ Prerequisites:
 
 To view security findings:
 
-1. On the left vertical menu bar, select **GitLab Workflow** (**{tanuki}**) to display the extension sidebar.
+1. On the vertical menu bar, select **GitLab Workflow** (**{tanuki}**) to display the extension sidebar.
 1. On the sidebar, expand **Security scanning**.
 1. Select either **New findings** or **Fixed findings**.
 1. Select a desired severity level.
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index ceb1c6f66fb..f0f4fd83e9e 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -149,7 +149,7 @@ We now create a VPC, a virtual networking environment that you control:
    `10.0.0.0/16`. If you don't require dedicated hardware, you can leave
    "Tenancy" as default. Select **Create VPC** when ready.
 
-   ![Create VPC](img/create_vpc_v17_0.png)
+   ![Create a VPC for GitLab cloud infrastructure](img/create_vpc_v17_0.png)
 
 1. Select the VPC, select **Actions**, select **Edit VPC Settings** and check **Enable DNS resolution**. Select **Save** when done.
 
@@ -193,7 +193,7 @@ create a new one:
 1. Select it from the table, and then under the **Actions** dropdown list choose
    "Attach to VPC".
 
-   ![Create gateway](img/create_gateway_v17_0.png)
+   ![Create an internet gateway](img/create_gateway_v17_0.png)
 
 1. Choose `gitlab-vpc` from the list and hit **Attach**.
 
@@ -409,7 +409,7 @@ persistence and is used to store session data, temporary cache information, and
    Select the VPC we created earlier (`gitlab-vpc`) and ensure the selected subnets table only contains the [private subnets](#subnets).
 1. Select **Create** when ready.
 
-   ![ElastiCache subnet](img/ec_subnet_v17_0.png)
+   ![Create a subnet group](img/ec_subnet_v17_0.png)
 
 ### Create the Redis Cluster
 
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index 7f5b4a6aa15..8dcb5cfff08 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -31,98 +31,120 @@ To authenticate, you can use:
   with the scope set to `api`.
 - A [deploy token](../../project/deploy_tokens/index.md) with the scope set to
   `read_package_registry`, `write_package_registry`, or both.
-- A [CI job token](../../../ci/jobs/ci_job_token.md).
+- A [CI/CD job token](../../../ci/jobs/ci_job_token.md).
 
 If your organization uses two-factor authentication (2FA), you must use a personal access token with the scope set to `api`.
-If you are publishing a package via CI/CD pipelines, you must use a CI job token.
+If you want to publish a package with a CI/CD pipeline, you must use a CI/CD job token.
 For more information, review the [guidance on tokens](../../../user/packages/package_registry/index.md#authenticate-with-the-registry).
 
 Do not use authentication methods other than the methods documented here. Undocumented authentication methods might be removed in the future.
 
-### Authenticate with the `.npmrc`
+### With the `.npmrc` file
 
 Create or edit the `.npmrc` file in the same directory as your `package.json`. Include the following lines in the `.npmrc` file:
 
 ```shell
-  //your_domain_name/api/v4/projects/your_project_id/packages/npm/:_authToken="${NPM_TOKEN}"
+  //<domain_name>/api/v4/projects/<project_id>/packages/npm/:_authToken="${NPM_TOKEN}"
 ```
 
-If you're installing:
-
-- From an instance:
-
-  ```shell
-  //your_domain_name/api/v4/packages/npm/:_authToken="${NPM_TOKEN}"
-  ```
-
-- From a group:
-
-  ```shell
-  //your_domain_name/api/v4/groups/your_group_id/-/packages/npm/:_authToken="${NPM_TOKEN}"
-  ```
-
-- From a project:
-
-  ```shell
-  //your_domain_name/api/v4/projects/your_project_id/packages/npm/:_authToken="${NPM_TOKEN}"
-  ```
-
-In these examples:
-
-- Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-- Replace `your_group_id` with your group ID, found on the group's home page.
-- Replace `your_project_id` with your project ID, found on the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
-- Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
-
 WARNING:
 Never hardcode GitLab tokens (or any tokens) directly in `.npmrc` files or any other files that can
 be committed to a repository.
 
-### Authenticate with `npm config set`
+For example:
+
+::Tabs
+
+:::TabTitle For an instance
+
+```shell
+//<domain_name>/api/v4/packages/npm/:_authToken="${NPM_TOKEN}"
+```
+
+Replace `<domain_name>` with your domain name. For example, `gitlab.com`.
+
+:::TabTitle For a group
+
+```shell
+//<domain_name>/api/v4/groups/<group_id>/-/packages/npm/:_authToken="${NPM_TOKEN}"
+```
+
+Make sure to replace:
+
+- `<domain_name>` with your domain name. For example, `gitlab.com`.
+- `<group_id>` with the group ID from the group home page.
+
+:::TabTitle For a project
+
+```shell
+//<domain_name>/api/v4/projects/<project_id>/packages/npm/:_authToken="${NPM_TOKEN}"
+```
+
+Make sure to replace:
+
+- `<domain_name>` with your domain name. For example, `gitlab.com`.
+- `<project_id>` with the project ID from the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
+
+::EndTabs
+
+### With `npm config set`
 
 To do this:
 
 ```shell
-npm config set -- //your_domain_name/:_authToken=your_token
+npm config set -- //<domain_name>/:_authToken=<token>
 ```
 
-With npm version 7 or earlier, use the full URL to the endpoint.
+Depending on your npm version, you might need to make changes to the URL:
 
-If you're installing:
-
-- From an instance:
-
-  ```shell
-  npm config set -- //your_domain_name/api/v4/packages/npm/:_authToken=your_token
-  ```
-
-- From a group:
-
-  ```shell
-  npm config set -- //your_domain_name/api/v4/groups/your_group_id/-/packages/npm/:_authToken=your_token
-  ```
-
-- From a project:
-
-  ```shell
-  npm config set -- //your_domain_name/api/v4/projects/your_project_id/packages/npm/:_authToken=your_token
-  ```
-
-In these examples:
-
-- Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-- Replace `your_group_id` with your group ID, found on the group's home page.
-- Replace `your_project_id` with your project ID, found on the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
-- Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
-
-NOTE:
-In npm versions 8 and later, you can [use a URI fragment instead of a full URL](https://docs.npmjs.com/cli/v8/configuring-npm/npmrc/?v=true#auth-related-configuration)
-in the `_authToken` parameter. However, [group-specific endpoints](https://gitlab.com/gitlab-org/gitlab/-/issues/299834)
+- On npm version 7 or earlier, use the full URL to the endpoint.
+- On version 8 and later, for the `_authToken` parameter, you can [use a URI fragment instead of a full URL](https://docs.npmjs.com/cli/v8/configuring-npm/npmrc/?v=true#auth-related-configuration). [Group-specific endpoints](https://gitlab.com/gitlab-org/gitlab/-/issues/299834)
 are not supported.
 
+For example:
+
+::Tabs
+
+:::TabTitle For an instance
+
+```shell
+npm config set -- //<domain_name>/api/v4/packages/npm/:_authToken=<token>
+```
+
+Make sure to replace:
+
+- `<domain_name>` with your domain name. For example, `gitlab.com`.
+- `<token>` with your deploy token, group access token, project access token, or personal access token.
+
+:::TabTitle For a group
+
+```shell
+npm config set -- //<domain_name>/api/v4/groups/<group_id>/-/packages/npm/:_authToken=<token>
+```
+
+Make sure to replace:
+
+- `<domain_name>` with your domain name. For example, `gitlab.com`.
+- `<group_id>` with the group ID from the group home page.
+- `<token>` with your deploy token, group access token, project access token, or personal access token.
+
+:::TabTitle For a project
+
+```shell
+npm config set -- //<domain_name>/api/v4/projects/<project_id>/packages/npm/:_authToken=<token>
+```
+
+Make sure to replace:
+
+- `<domain_name>` with your domain name. For example, `gitlab.com`.
+- `<project_id>` with the project ID from the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
+- `<token>` with your deploy token, group access token, project access token, or personal access token.
+
+::EndTabs
+
 ## Set up the registry URL
 
-To publish or install packages from the GitLab Package Registry, you need to configure npm to use the correct registry URL. The configuration method and URL structure depend on whether you're publishing or installing packages.
+To publish or install packages from the GitLab package registry, you need to configure npm to use the correct registry URL. The configuration method and URL structure depend on whether you're publishing or installing packages.
 
 Before configuring the registry URL, it's important to understand the scope of different configuration methods:
 
@@ -137,9 +159,11 @@ especially on shared systems.
 
 ### For publishing packages
 
-When publishing packages, use the project endpoint. The URL structure is:
+When publishing packages, use the project endpoint:
 
-`https://gitlab.example.com/api/v4/projects/<project_id>/packages/npm/`
+```shell
+https://gitlab.example.com/api/v4/projects/<project_id>/packages/npm/
+```
 
 Replace `gitlab.example.com` with your GitLab instance's domain and `<project_id>` with your project's ID.
 To configure this URL, use one of these methods:
@@ -164,7 +188,7 @@ npm config set @scope:registry=https://gitlab.example.com/api/v4/projects/<proje
 
 :::TabTitle `package.json`
 
-Add a publishConfig section to your `package.json`:
+Add a `publishConfig` section to your `package.json`:
 
 ```shell
 {
@@ -180,7 +204,7 @@ Replace `@scope` with your package's scope.
 
 ### For installing packages
 
-When installing packages, you can use project, group, or instance-level endpoints. The URL structure varies accordingly:
+When installing packages, you can use project, group, or instance endpoints. The URL structure varies accordingly:
 
 You can configure these URLs using one of the following methods:
 
@@ -237,7 +261,7 @@ Use the `npm config set` command with the appropriate URL:
 
 Replace `gitlab.example.com`, `<project_id>`, `<group_id>`, and `@scope` with the appropriate values for your GitLab instance and package.
 
-After you configure your registry URL, set up authentication as described in the authentication section.
+After you configure your registry URL, you can authenticate to the package registry.
 
 ## Publish to GitLab package registry
 
@@ -246,7 +270,7 @@ To publish an npm package to the GitLab package registry, you must be
 
 ### Naming convention
 
-Depending on how the package is installed, you may need to adhere to the naming convention.
+Depending on how the package is installed, you might need to adhere to the naming convention.
 
 You can use one of three API endpoints to install packages:
 
@@ -264,7 +288,7 @@ option in the `package.json`.
 
 - The value used for the `@scope` is the root of the project that is hosting the packages and not the root
   of the project with the source code of the package itself. The scope should be lowercase.
-- The package name can be anything you want
+- The package name can be anything you want.
 
 | Project URL                                             | Package registry in | Scope     | Full package name      |
 | ------------------------------------------------------- | ------------------- | --------- | ---------------------- |
@@ -276,7 +300,7 @@ Make sure that the name of your package in the `package.json` file matches this
 "name": "@my-org/package-name"
 ```
 
-### Publishing a package via the command line
+### Publish a package with the command line
 
 After you [configure authentication](#authenticate-to-the-package-registry), publish the NPM package with:
 
@@ -287,20 +311,21 @@ npm publish
 If you're using an `.npmrc` file for authentication, set the expected environment variables:
 
 ```shell
-NPM_TOKEN=your_token npm publish
+NPM_TOKEN=<token> npm publish
 ```
 
-Your package should now publish to the package registry.
-
 If the uploaded package has more than one `package.json` file, only the first one found is used, and the others are ignored.
 
-## Publishing a package by using a CI/CD pipeline
+### Publish a package with a CI/CD pipeline
 
-When publishing by using a CI/CD pipeline, you can use the [predefined variables](../../../ci/variables/predefined_variables.md) `${CI_PROJECT_ID}` and `${CI_JOB_TOKEN}` to authenticate with your project's package registry. We use these variables to create a `.npmrc` file [for authentication](#authenticate-with-the-npmrc) during execution of your CI/CD job.
+When publishing by using a CI/CD pipeline, you can use the
+[predefined variables](../../../ci/variables/predefined_variables.md) `${CI_PROJECT_ID}` and `${CI_JOB_TOKEN}`
+to authenticate with your project's package registry. GitLab uses these variables to create a `.npmrc` file
+for authentication during execution of your CI/CD job.
 
-WARNING:
-When generating the `.npmrc` file, do not specify the port after `${CI_SERVER_HOST}` if it is a default port,
-such as `80` for a URL starting with `http` or `443` for a URL starting with `https`.
+NOTE:
+When you generate the `.npmrc` file, do not specify the port after `${CI_SERVER_HOST}` if it is a default port.
+`http` URLs default to `80`, and `https` URLs default to `443`.
 
 In the GitLab project containing your `package.json`, edit or create a `.gitlab-ci.yml` file. For example:
 
@@ -319,13 +344,13 @@ publish-npm:
     - npm publish
 ```
 
-- Replace `@scope` with the [scope](https://docs.npmjs.com/cli/v10/using-npm/scope/) of the package that is being published.
+Replace `@scope` with the [scope](https://docs.npmjs.com/cli/v10/using-npm/scope/) of the package that is being published.
 
 Your package is published to the package registry when the `publish-npm` job in your pipeline runs.
 
 ## Install a package
 
-If multiple packages have the same name and version, when you install a package, the most recently-published package is retrieved.
+If multiple packages have the same name and version, when you install a package, the most recently published package is retrieved.
 
 You can install a package from a GitLab project, group, or instance:
 
@@ -335,22 +360,21 @@ You can install a package from a GitLab project, group, or instance:
 
 ### Install from an instance
 
-WARNING:
-To install a package from an instance, the package must have been published following the scoped [naming convention](#naming-convention).
+Prerequisites:
+
+- The package was published according to the scoped [naming convention](#naming-convention).
 
 1. [Authenticate to the package registry](#authenticate-to-the-package-registry).
-
-1. Set the registry
+1. Set the registry:
 
    ```shell
-   npm config set @scope:registry https://your_domain_name.com/api/v4/packages/npm/
+   npm config set @scope:registry https://<domain_name>.com/api/v4/packages/npm/
    ```
 
-   - Replace `@scope` with the [root level group](#naming-convention) of the project you're installing to the package from.
-   - Replace `your_domain_name` with your domain name, for example `gitlab.com`.
-   - Replace `your_token` with a deploy token, group access token, project access token, or personal access token.
+   - Replace `@scope` with the [top-level group](#naming-convention) of the project you're installing to the package from.
+   - Replace `<domain_name>` with your domain name, for example `gitlab.com`.
 
-1. Install the package
+1. Install the package:
 
    ```shell
    npm install @scope/my-package
@@ -362,18 +386,17 @@ To install a package from an instance, the package must have been published foll
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121837) in GitLab 16.1. Feature flag `npm_group_level_endpoints` removed.
 
 1. [Authenticate to the package registry](#authenticate-to-the-package-registry).
-
-1. Set the registry
+1. Set the registry:
 
    ```shell
-   npm config set @scope:registry=https://your_domain_name/api/v4/groups/your_group_id/-/packages/npm/
+   npm config set @scope:registry=https://<domain_name>/api/v4/groups/<group_id>/-/packages/npm/
    ```
 
-   - Replace `@scope` with the [root level group](#naming-convention) of the group you're installing to the package from.
-   - Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-   - Replace `your_group_id` is your group ID, found on the group's home page.
+   - Replace `@scope` with the [top-level group](#naming-convention) of the group you're installing to the package from.
+   - Replace `<domain_name>` with your domain name, for example, `gitlab.com`.
+   - Replace `<group_id>` with your group ID, found on the group's home page.
 
-1. Install the package
+1. Install the package:
 
    ```shell
    npm install @scope/my-package
@@ -382,18 +405,17 @@ To install a package from an instance, the package must have been published foll
 ### Install from a project
 
 1. [Authenticate to the package registry](#authenticate-to-the-package-registry).
-
-1. Set the registry
+1. Set the registry:
 
    ```shell
-   npm config set @scope:registry=https://your_domain_name/api/v4/projects/your_project_id/packages/npm/
+   npm config set @scope:registry=https://<domain_name>/api/v4/projects/<project_id>/packages/npm/
    ```
 
-   - Replace `@scope` with the [root level group](#naming-convention) of the project you're installing to the package from.
-   - Replace `your_domain_name` with your domain name, for example, `gitlab.com`.
-   - Replace `your_project_id` with your project ID, found on the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
+   - Replace `@scope` with the [top-level group](#naming-convention) of the project you're installing to the package from.
+   - Replace `<domain_name>` with your domain name, for example, `gitlab.com`.
+   - Replace `<project_id>` with your project ID, found on the [project overview page](../../project/working_with_projects.md#access-a-project-by-using-the-project-id).
 
-1. Install the package
+1. Install the package:
 
    ```shell
    npm install @scope/my-package
@@ -418,10 +440,10 @@ Improvements are tracked in [epic 3608](https://gitlab.com/groups/gitlab-org/-/e
 
 You can deprecate a package so that a deprecation warning displays when the package is fetched.
 
-Pre-requisites:
+Prerequisites:
 
-- The same [permissions](../../permissions.md) as deleting a package.
-- [Authenticated to the package registry](#authenticate-to-the-package-registry).
+- You have the necessary [permissions](../../permissions.md) to delete a package.
+- You are [authenticated to the package registry](#authenticate-to-the-package-registry).
 
 From the command line, run:
 
@@ -503,7 +525,13 @@ npm install @scope/package@my-tag              # Install a specific tag
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/258835) in GitLab 15.10.
 
 You can use a [`CI_JOB_TOKEN`](../../../ci/jobs/ci_job_token.md) or [deploy token](../../project/deploy_tokens/index.md)
-to run `npm dist-tag` commands in a GitLab CI/CD job. For example:
+to run `npm dist-tag` commands in a GitLab CI/CD job.
+
+Prerequisites:
+
+- You have npm version 6.9.1 or later. In earlier versions, deleting distribution tags fails due to a bug in npm 6.9.0.
+
+For example:
 
 ```yaml
 npm-deploy-job:
@@ -512,8 +540,6 @@ npm-deploy-job:
     - npm dist-tag add @scope/package@version my-tag
 ```
 
-Due to a bug in npm 6.9.0, deleting distribution tags fails. Make sure your npm version is 6.9.1 or later.
-
 ### Supported CLI commands
 
 The GitLab npm repository supports the following commands for the npm CLI (`npm`) and yarn CLI
diff --git a/doc/user/packages/package_registry/index.md b/doc/user/packages/package_registry/index.md
index 2008be32fa9..44f038405fa 100644
--- a/doc/user/packages/package_registry/index.md
+++ b/doc/user/packages/package_registry/index.md
@@ -85,7 +85,7 @@ For more information about using the GitLab package registry with CI/CD, see:
 
 - [Generic](../generic_packages/index.md#publish-a-generic-package-by-using-cicd)
 - [Maven](../maven_repository/index.md#create-maven-packages-with-gitlab-cicd)
-- [npm](../npm_registry/index.md#publishing-a-package-by-using-a-cicd-pipeline)
+- [npm](../npm_registry/index.md#publish-a-package-with-a-cicd-pipeline)
 - [NuGet](../nuget_repository/index.md#publish-a-nuget-package-by-using-cicd)
 - [PyPI](../pypi_repository/index.md#authenticate-with-a-ci-job-token)
 - [Terraform](../terraform_module_registry/index.md#authenticate-to-the-terraform-module-registry)
diff --git a/scripts/internal_events/cli/flows/metric_definer.rb b/scripts/internal_events/cli/flows/metric_definer.rb
index 89854e2dfd4..4d6ff7973ca 100755
--- a/scripts/internal_events/cli/flows/metric_definer.rb
+++ b/scripts/internal_events/cli/flows/metric_definer.rb
@@ -271,20 +271,20 @@ module InternalEventsCli
       end
 
       def prompt_for_tier(defaults)
-        assign_shared_attr(:tier) do
+        assign_shared_attr(:tiers) do
           new_page!(8, 9, STEPS)
 
           prompt_for_array_selection(
             'Which tiers will the metric be reported from?',
             [%w[free premium ultimate], %w[premium ultimate], %w[ultimate]],
-            defaults[:tier]
+            defaults[:tiers]
           )
         end
 
-        assign_shared_attr(:tiers) { |metric| [*metric.tier] }
+        assign_shared_attr(:tiers) { |metric| [*metric.tiers] }
 
         assign_shared_attr(:distribution) do |metric|
-          metric.tier.include?('free') ? %w[ce ee] : %w[ee]
+          metric.tiers.include?('free') ? %w[ce ee] : %w[ee]
         end
       end
 
@@ -538,7 +538,6 @@ module InternalEventsCli
           fields[:stage] << find_stage(event.product_group)
           fields[:section] << find_section(event.product_group)
           fields[:distribution] << event.distributions&.sort
-          fields[:tier] << event.tiers&.sort
           fields[:tiers] << event.tiers&.sort
         end
 
diff --git a/scripts/internal_events/cli/metric.rb b/scripts/internal_events/cli/metric.rb
index a24bfaa87e5..2f907dea16e 100755
--- a/scripts/internal_events/cli/metric.rb
+++ b/scripts/internal_events/cli/metric.rb
@@ -15,7 +15,6 @@ module InternalEventsCli
     :data_category,
     :product_categories,
     :distribution,
-    :tier,
     :tiers,
     :events
   ].freeze
diff --git a/spec/fixtures/scripts/internal_events/metric_definer_examples.yml b/spec/fixtures/scripts/internal_events/metric_definer_examples.yml
index c57d137bcaf..bd3beccc6c6 100644
--- a/spec/fixtures/scripts/internal_events/metric_definer_examples.yml
+++ b/spec/fixtures/scripts/internal_events/metric_definer_examples.yml
@@ -120,7 +120,7 @@
     - "2\n" # Enum-select: Modify attributes
     - "\n" # Accept group from event definition
     - "\n" # Accept URL from event definition
-    - "2\n" # Override tier -> Select: [premium, ultimate]
+    - "2\n" # Override tiers -> Select: [premium, ultimate]
     - "y\n" # Create file
     - "5\n" # Exit
   outputs:
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
index 92315aed777..d62ffed3926 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_28d_single_event.yml
@@ -12,9 +12,6 @@ data_source: internal_events
 data_category: optional
 distribution:
 - ee
-tier:
-- premium
-- ultimate
 tiers:
 - premium
 - ultimate
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
index 8bf955e6b65..bdd779d5979 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_7d_single_event.yml
@@ -12,9 +12,6 @@ data_source: internal_events
 data_category: optional
 distribution:
 - ee
-tier:
-- premium
-- ultimate
 tiers:
 - premium
 - ultimate
diff --git a/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
index 829e2df4f8b..df1f389396a 100644
--- a/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/ee_total_single_event.yml
@@ -12,9 +12,6 @@ data_source: internal_events
 data_category: optional
 distribution:
 - ee
-tier:
-- premium
-- ultimate
 tiers:
 - premium
 - ultimate
diff --git a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
index 8b6335ba897..7f1cd0e8cd2 100644
--- a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_28d.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
index 7f22aa80771..49da688c84f 100644
--- a/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/keyboard_smashed_metric_7d.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/label_28d_single_event_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/label_28d_single_event_additional_props.yml
index 8b3ca468a0c..b8fa6759828 100644
--- a/spec/fixtures/scripts/internal_events/metrics/label_28d_single_event_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/label_28d_single_event_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/label_7d_single_event_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/label_7d_single_event_additional_props.yml
index b67a333c9bf..29159f21b88 100644
--- a/spec/fixtures/scripts/internal_events/metrics/label_7d_single_event_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/label_7d_single_event_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml b/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
index 6efd5619cbe..ee89639f1f3 100644
--- a/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/project_id_28d_multiple_events.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml b/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
index 7f47884b4b2..4b2bd2aab9e 100644
--- a/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/project_id_7d_multiple_events.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/total_multi_event_some_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/total_multi_event_some_additional_props.yml
index cd6180dc47f..521cb16f360 100644
--- a/spec/fixtures/scripts/internal_events/metrics/total_multi_event_some_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/total_multi_event_some_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/total_multiple_events_with_rename.yml b/spec/fixtures/scripts/internal_events/metrics/total_multiple_events_with_rename.yml
index 3463caa680c..2b9bc30b966 100644
--- a/spec/fixtures/scripts/internal_events/metrics/total_multiple_events_with_rename.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/total_multiple_events_with_rename.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
index a3ae9a80e08..79633d35b81 100644
--- a/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/total_single_event.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
index 4d5ba4ea99e..02dbccc9be4 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_additional_props.yml
index 46847738253..9a42b7329d3 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_all_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_all_additional_props.yml
index ddda99a397c..3b7b2f59207 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_all_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_all_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_custom_key_filter.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_custom_key_filter.yml
index a391affc7cc..a6c5691ea1c 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_custom_key_filter.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_28d_single_event_custom_key_filter.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
index 253005c84c3..f4677db447f 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_additional_props.yml
index 0bad13709c2..a2da550b0c1 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_all_additional_props.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_all_additional_props.yml
index 6eb8392bd41..955ace6252b 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_all_additional_props.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_all_additional_props.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_custom_key_filter.yml b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_custom_key_filter.yml
index 03d818e32ef..7d8dc8f0bf8 100644
--- a/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_custom_key_filter.yml
+++ b/spec/fixtures/scripts/internal_events/metrics/user_id_7d_single_event_custom_key_filter.yml
@@ -13,10 +13,6 @@ data_category: optional
 distribution:
 - ce
 - ee
-tier:
-- free
-- premium
-- ultimate
 tiers:
 - free
 - premium
diff --git a/spec/frontend/access_tokens/components/token_spec.js b/spec/frontend/access_tokens/components/token_spec.js
index 84954194b79..cd2c615194b 100644
--- a/spec/frontend/access_tokens/components/token_spec.js
+++ b/spec/frontend/access_tokens/components/token_spec.js
@@ -2,6 +2,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 
 import Token from '~/access_tokens/components/token.vue';
 import InputCopyToggleVisibility from '~/vue_shared/components/form/input_copy_toggle_visibility.vue';
+import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
 
 describe('Token', () => {
   let wrapper;
@@ -20,13 +21,17 @@ describe('Token', () => {
   };
 
   const createComponent = () => {
-    wrapper = shallowMountExtended(Token, { propsData: defaultPropsData, slots: defaultSlots });
+    wrapper = shallowMountExtended(Token, {
+      propsData: defaultPropsData,
+      slots: defaultSlots,
+      stubs: { SettingsSection },
+    });
   };
 
   it('renders title slot', () => {
     createComponent();
 
-    expect(wrapper.findByText(defaultSlots.title, { selector: 'h4' }).exists()).toBe(true);
+    expect(wrapper.findByRole('heading', { name: defaultSlots.title }).exists()).toBe(true);
   });
 
   it('renders description slot', () => {
diff --git a/spec/frontend/diffs/components/diff_discussion_reply_spec.js b/spec/frontend/diffs/components/diff_discussion_reply_spec.js
index 1e542c413b2..0f4d6b642b1 100644
--- a/spec/frontend/diffs/components/diff_discussion_reply_spec.js
+++ b/spec/frontend/diffs/components/diff_discussion_reply_spec.js
@@ -5,6 +5,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import DiffDiscussionReply from '~/diffs/components/diff_discussion_reply.vue';
 import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue';
+import DiscussionLockedWidget from '~/notes/components/discussion_locked_widget.vue';
 
 import { START_THREAD } from '~/diffs/i18n';
 
@@ -27,14 +28,20 @@ describe('DiffDiscussionReply', () => {
     });
   };
 
-  describe('if user can reply', () => {
+  describe('if user is signed in', () => {
     beforeEach(() => {
       getters = {
         userCanReply: () => true,
+        getNoteableData: () => ({
+          current_user: {
+            can_create_note: true,
+          },
+        }),
         getUserData: () => ({
           path: 'test-path',
           avatar_url: 'avatar_url',
           name: 'John Doe',
+          id: 1,
         }),
       };
 
@@ -78,6 +85,7 @@ describe('DiffDiscussionReply', () => {
       'reply button existence is `$showButton` when userCanReply is `$userCanReply`, hasForm is `$hasForm` and renderReplyPlaceholder is `$renderReplyPlaceholder`',
       ({ userCanReply, hasForm, renderReplyPlaceholder, showButton }) => {
         getters = {
+          ...getters,
           userCanReply: () => userCanReply,
         };
 
@@ -93,23 +101,54 @@ describe('DiffDiscussionReply', () => {
         expect(wrapper.findComponent(GlButton).exists()).toBe(showButton);
       },
     );
+
+    it('shows the locked discussion widget when the user is not allowed to create notes', () => {
+      getters = {
+        ...getters,
+        getNoteableData: () => ({
+          current_user: {
+            can_create_note: false,
+          },
+        }),
+      };
+
+      store = new Vuex.Store({
+        getters,
+      });
+
+      createComponent({
+        renderReplyPlaceholder: false,
+        hasForm: false,
+      });
+
+      expect(wrapper.findComponent(DiscussionLockedWidget).exists()).toBe(true);
+    });
   });
 
-  it('renders a signed out widget when user is not logged in', () => {
-    getters = {
-      userCanReply: () => false,
-      getUserData: () => null,
-    };
+  describe('if user is signed out', () => {
+    beforeEach(() => {
+      getters = {
+        userCanReply: () => false,
+        getNoteableData: () => ({
+          current_user: {
+            can_create_note: false,
+          },
+        }),
+        getUserData: () => null,
+      };
 
-    store = new Vuex.Store({
-      getters,
+      store = new Vuex.Store({
+        getters,
+      });
     });
 
-    createComponent({
-      renderReplyPlaceholder: false,
-      hasForm: false,
-    });
+    it('renders a signed out widget when user is not logged in', () => {
+      createComponent({
+        renderReplyPlaceholder: false,
+        hasForm: false,
+      });
 
-    expect(wrapper.findComponent(NoteSignedOutWidget).exists()).toBe(true);
+      expect(wrapper.findComponent(NoteSignedOutWidget).exists()).toBe(true);
+    });
   });
 });
diff --git a/spec/lib/gitlab/database/sharding_key_spec.rb b/spec/lib/gitlab/database/sharding_key_spec.rb
index b07ac58381e..f52392c6c2e 100644
--- a/spec/lib/gitlab/database/sharding_key_spec.rb
+++ b/spec/lib/gitlab/database/sharding_key_spec.rb
@@ -81,7 +81,9 @@ RSpec.describe 'new tables missing sharding_key', feature_category: :cell do
       'analytics_cycle_analytics_merge_request_stage_events.group_id',
       # This is event log table for gitlab_subscriptions and should not be deleted.
       # See more: https://gitlab.com/gitlab-org/gitlab/-/issues/462598#note_1949768698
-      'gitlab_subscription_histories.namespace_id'
+      'gitlab_subscription_histories.namespace_id',
+      # allowed as it points to itself
+      'organizations.id'
     ]
   end
 
diff --git a/spec/models/hooks/web_hook_log_spec.rb b/spec/models/hooks/web_hook_log_spec.rb
index 4d1ae5085a4..e4e62257f1f 100644
--- a/spec/models/hooks/web_hook_log_spec.rb
+++ b/spec/models/hooks/web_hook_log_spec.rb
@@ -233,7 +233,6 @@ RSpec.describe WebHookLog, feature_category: :webhooks do
   end
 
   describe '#request_headers' do
-    let(:hook) { build(:project_hook, :token) }
     let(:web_hook_log) { build(:web_hook_log, request_headers: request_headers) }
     let(:expected_headers) { { 'X-Gitlab-Token' => _('[REDACTED]') } }
 
@@ -244,10 +243,16 @@ RSpec.describe WebHookLog, feature_category: :webhooks do
     end
 
     context 'with exposed headers token' do
-      let(:request_headers) { { 'X-Gitlab-Token' => hook.token } }
+      let(:request_headers) { { 'X-Gitlab-Token' => 'secret_token' } }
 
       it { expect(web_hook_log.request_headers).to eq(expected_headers) }
     end
+
+    context 'with no token headers' do
+      let(:request_headers) { {} }
+
+      it { expect(web_hook_log.request_headers['X-Gitlab-Token']).to be_nil }
+    end
   end
 
   describe '#url_current?' do
diff --git a/tooling/config/CODEOWNERS.yml b/tooling/config/CODEOWNERS.yml
index 91d2fd6c218..e5bcb3c5983 100644
--- a/tooling/config/CODEOWNERS.yml
+++ b/tooling/config/CODEOWNERS.yml
@@ -3,7 +3,7 @@
 # And paste the contents into .gitlab/CODEOWNERS
 
 '[Authentication]':
-  '@gitlab-org/govern/authentication/approvers':
+  '@gitlab-org/software-supply-chain-security/authentication/approvers':
     allow:
       keywords:
         - 'password'
@@ -66,7 +66,7 @@
         - '%{keyword}'
 
 '[Compliance]':
-  '@gitlab-org/govern/compliance':
+  '@gitlab-org/software-supply-chain-security/compliance':
     entries:
       - '/ee/app/services/audit_events/build_service.rb'
       - '/ee/spec/services/audit_events/custom_audit_event_service_spec.rb'