diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs
index 552d8345ff3..c5f9fb2432e 100644
--- a/.eslint_todo/vue-no-unused-properties.mjs
+++ b/.eslint_todo/vue-no-unused-properties.mjs
@@ -220,7 +220,6 @@ export default {
     'app/assets/javascripts/token_access/components/token_permissions.vue',
     'app/assets/javascripts/usage_quotas/components/search_and_sort_bar/search_and_sort_bar.vue',
     'app/assets/javascripts/user_lists/components/user_lists.vue',
-    'app/assets/javascripts/webhooks/components/form_custom_header_item.vue',
     'app/assets/javascripts/wikis/components/wiki_content.vue',
     'app/assets/javascripts/wikis/components/wiki_form.vue',
     'app/assets/javascripts/wikis/wiki_notes/components/placeholder_note.vue',
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 26d02b1c910..3604c335d06 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-a1bcfea2e0377e844df072e9143b05f52f846723
+86a2c426295d105b55455cd694e6929e4bce1d98
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index bd1a31b8929..98488193ed6 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-1ed908c7dd2f4daef8f29d9f88461b81d16559ea
+5a16392c66524f6e4f2745a85d24cdaad3e2b777
diff --git a/app/assets/javascripts/webhooks/components/form_custom_header_item.vue b/app/assets/javascripts/webhooks/components/form_custom_header_item.vue
index 3fd60de7cc5..8316e7aff29 100644
--- a/app/assets/javascripts/webhooks/components/form_custom_header_item.vue
+++ b/app/assets/javascripts/webhooks/components/form_custom_header_item.vue
@@ -1,5 +1,4 @@
 <script>
-import { isEmpty } from 'lodash';
 import { GlButton, GlFormGroup, GlFormInput, GlTooltipDirective } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import { MASK_ITEM_VALUE_HIDDEN } from '../constants';
@@ -57,7 +56,6 @@ export default {
     },
   },
   methods: {
-    isEmpty,
     s__,
   },
   i18n: {
diff --git a/app/models/deployment_cluster.rb b/app/models/deployment_cluster.rb
index 3390d397bad..1f81615840b 100644
--- a/app/models/deployment_cluster.rb
+++ b/app/models/deployment_cluster.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 class DeploymentCluster < ApplicationRecord
+  include IgnorableColumns
+
+  ignore_column :deployment_id_convert_to_bigint, :cluster_id_convert_to_bigint,
+    remove_with: '18.3', remove_after: '2025-09-01'
+
   belongs_to :deployment, optional: false
   belongs_to :cluster, optional: false, class_name: 'Clusters::Cluster'
 end
diff --git a/db/migrate/20240221145450_create_audit_events_instance_streaming_event_type_filters.rb b/db/migrate/20240221145450_create_audit_events_instance_streaming_event_type_filters.rb
index 7195a359581..c01e933e1ea 100644
--- a/db/migrate/20240221145450_create_audit_events_instance_streaming_event_type_filters.rb
+++ b/db/migrate/20240221145450_create_audit_events_instance_streaming_event_type_filters.rb
@@ -2,7 +2,6 @@
 
 class CreateAuditEventsInstanceStreamingEventTypeFilters < Gitlab::Database::Migration[2.2]
   milestone '16.11'
-  enable_lock_retries!
 
   INDEX_NAME = 'uniq_audit_instance_event_filters_destination_id_and_event_type'
 
diff --git a/db/migrate/20240304184128_create_ci_build_names_table.rb b/db/migrate/20240304184128_create_ci_build_names_table.rb
index cfb99352d55..03bff511f8f 100644
--- a/db/migrate/20240304184128_create_ci_build_names_table.rb
+++ b/db/migrate/20240304184128_create_ci_build_names_table.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class CreateCiBuildNamesTable < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '16.11'
 
   PRIMARY_KEY = [:build_id, :partition_id]
diff --git a/db/migrate/20240304195555_add_search_vector_to_p_ci_build_names.rb b/db/migrate/20240304195555_add_search_vector_to_p_ci_build_names.rb
index 4f6a24517a4..2742b8cb2a6 100644
--- a/db/migrate/20240304195555_add_search_vector_to_p_ci_build_names.rb
+++ b/db/migrate/20240304195555_add_search_vector_to_p_ci_build_names.rb
@@ -3,8 +3,6 @@
 class AddSearchVectorToPCiBuildNames < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
-
   def up
     execute <<~SQL
       ALTER TABLE p_ci_build_names
diff --git a/db/migrate/20240304195852_create_partitions_for_p_ci_build_names.rb b/db/migrate/20240304195852_create_partitions_for_p_ci_build_names.rb
index 98b046b970a..c175e0702fe 100644
--- a/db/migrate/20240304195852_create_partitions_for_p_ci_build_names.rb
+++ b/db/migrate/20240304195852_create_partitions_for_p_ci_build_names.rb
@@ -3,8 +3,6 @@
 class CreatePartitionsForPCiBuildNames < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
-
   def up
     connection.execute(<<~SQL)
       LOCK TABLE p_ci_builds IN SHARE ROW EXCLUSIVE MODE;
diff --git a/db/migrate/20240305201830_add_custom_headers_to_web_hook.rb b/db/migrate/20240305201830_add_custom_headers_to_web_hook.rb
index 4bf4fef0453..1b9dd39a7a7 100644
--- a/db/migrate/20240305201830_add_custom_headers_to_web_hook.rb
+++ b/db/migrate/20240305201830_add_custom_headers_to_web_hook.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddCustomHeadersToWebHook < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '16.11'
 
   def change
diff --git a/db/migrate/20240320060913_add_container_scanning_for_registry_toggle_to_security_project_settings.rb b/db/migrate/20240320060913_add_container_scanning_for_registry_toggle_to_security_project_settings.rb
index 4ff4cc8f3a8..165ea3bdce1 100644
--- a/db/migrate/20240320060913_add_container_scanning_for_registry_toggle_to_security_project_settings.rb
+++ b/db/migrate/20240320060913_add_container_scanning_for_registry_toggle_to_security_project_settings.rb
@@ -3,7 +3,6 @@
 class AddContainerScanningForRegistryToggleToSecurityProjectSettings < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
   TABLE_NAME = :project_security_settings
   COLUMN_NAME = :container_scanning_for_registry_enabled
 
diff --git a/db/migrate/20240320062459_add_trial_to_subscription_add_on_purchases.rb b/db/migrate/20240320062459_add_trial_to_subscription_add_on_purchases.rb
index 7ea63abc813..ef1c95735a7 100644
--- a/db/migrate/20240320062459_add_trial_to_subscription_add_on_purchases.rb
+++ b/db/migrate/20240320062459_add_trial_to_subscription_add_on_purchases.rb
@@ -3,8 +3,6 @@
 class AddTrialToSubscriptionAddOnPurchases < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
-
   def change
     add_column :subscription_add_on_purchases, :trial, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20240325115147_create_project_saved_replies_table.rb b/db/migrate/20240325115147_create_project_saved_replies_table.rb
index ff51abc065d..6fee7f2940b 100644
--- a/db/migrate/20240325115147_create_project_saved_replies_table.rb
+++ b/db/migrate/20240325115147_create_project_saved_replies_table.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class CreateProjectSavedRepliesTable < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '16.11'
 
   def change
diff --git a/db/migrate/20240325150539_add_pre_receive_secret_detection_enabled_to_project_security_settings.rb b/db/migrate/20240325150539_add_pre_receive_secret_detection_enabled_to_project_security_settings.rb
index d08717e4d49..4383c002a34 100644
--- a/db/migrate/20240325150539_add_pre_receive_secret_detection_enabled_to_project_security_settings.rb
+++ b/db/migrate/20240325150539_add_pre_receive_secret_detection_enabled_to_project_security_settings.rb
@@ -3,7 +3,6 @@
 class AddPreReceiveSecretDetectionEnabledToProjectSecuritySettings < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
   TABLE_NAME = :project_security_settings
   COLUMN_NAME = :pre_receive_secret_detection_enabled
 
diff --git a/db/migrate/20240326144116_add_zoekt_settings_to_application_settings.rb b/db/migrate/20240326144116_add_zoekt_settings_to_application_settings.rb
index 29bacba132c..f93a1e8cb26 100644
--- a/db/migrate/20240326144116_add_zoekt_settings_to_application_settings.rb
+++ b/db/migrate/20240326144116_add_zoekt_settings_to_application_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddZoektSettingsToApplicationSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '16.11'
 
   def change
diff --git a/db/migrate/20240327114933_add_override_changes_requested_to_merge_request.rb b/db/migrate/20240327114933_add_override_changes_requested_to_merge_request.rb
index 170ff090e8e..f9f90478529 100644
--- a/db/migrate/20240327114933_add_override_changes_requested_to_merge_request.rb
+++ b/db/migrate/20240327114933_add_override_changes_requested_to_merge_request.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class AddOverrideChangesRequestedToMergeRequest < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '16.11'
 
   def change
diff --git a/db/migrate/20240402181020_create_audit_events_streaming_instance_namespace_filters.rb b/db/migrate/20240402181020_create_audit_events_streaming_instance_namespace_filters.rb
index ffd6f3a50a2..d5cd5ca81ea 100644
--- a/db/migrate/20240402181020_create_audit_events_streaming_instance_namespace_filters.rb
+++ b/db/migrate/20240402181020_create_audit_events_streaming_instance_namespace_filters.rb
@@ -2,7 +2,6 @@
 
 class CreateAuditEventsStreamingInstanceNamespaceFilters < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  enable_lock_retries!
 
   UNIQ_INDEX_NAME = 'uniq_idx_streaming_destination_id_and_namespace_id'
   NAMESPACE_INDEX_NAME = 'idx_streaming_instance_namespace_filters_on_namespace_id'
diff --git a/db/migrate/20240403000000_add_fallback_behavior_to_scan_result_policy_reads.rb b/db/migrate/20240403000000_add_fallback_behavior_to_scan_result_policy_reads.rb
index 251f2ba1a2b..4e1df7bd183 100644
--- a/db/migrate/20240403000000_add_fallback_behavior_to_scan_result_policy_reads.rb
+++ b/db/migrate/20240403000000_add_fallback_behavior_to_scan_result_policy_reads.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddFallbackBehaviorToScanResultPolicyReads < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '16.11'
 
   def change
diff --git a/db/migrate/20240404191440_add_early_access_program_participant_to_user_preferences.rb b/db/migrate/20240404191440_add_early_access_program_participant_to_user_preferences.rb
index 8633106870f..d85e6a6f425 100644
--- a/db/migrate/20240404191440_add_early_access_program_participant_to_user_preferences.rb
+++ b/db/migrate/20240404191440_add_early_access_program_participant_to_user_preferences.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddEarlyAccessProgramParticipantToUserPreferences < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.0'
 
   def up
diff --git a/db/migrate/20240404192955_create_early_access_program_tracking_events.rb b/db/migrate/20240404192955_create_early_access_program_tracking_events.rb
index 1ff9d2d791a..a581054f5e2 100644
--- a/db/migrate/20240404192955_create_early_access_program_tracking_events.rb
+++ b/db/migrate/20240404192955_create_early_access_program_tracking_events.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class CreateEarlyAccessProgramTrackingEvents < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.0'
 
   def up
diff --git a/db/migrate/20240408105626_add_send_bot_message_to_policies.rb b/db/migrate/20240408105626_add_send_bot_message_to_policies.rb
index e9334d34723..82821414321 100644
--- a/db/migrate/20240408105626_add_send_bot_message_to_policies.rb
+++ b/db/migrate/20240408105626_add_send_bot_message_to_policies.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddSendBotMessageToPolicies < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.0'
 
   def change
diff --git a/db/migrate/20240409013009_add_importers_to_application_settings.rb b/db/migrate/20240409013009_add_importers_to_application_settings.rb
index 30c8c2ad7e7..a753c6e9f31 100644
--- a/db/migrate/20240409013009_add_importers_to_application_settings.rb
+++ b/db/migrate/20240409013009_add_importers_to_application_settings.rb
@@ -2,7 +2,6 @@
 
 class AddImportersToApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  enable_lock_retries!
 
   def change
     add_column :application_settings, :importers, :jsonb, default: {}, null: false
diff --git a/db/migrate/20240418135657_add_tickets_confidential_by_default_to_service_desk_settings.rb b/db/migrate/20240418135657_add_tickets_confidential_by_default_to_service_desk_settings.rb
index 00622e32a5f..1df2f7552b6 100644
--- a/db/migrate/20240418135657_add_tickets_confidential_by_default_to_service_desk_settings.rb
+++ b/db/migrate/20240418135657_add_tickets_confidential_by_default_to_service_desk_settings.rb
@@ -3,8 +3,6 @@
 class AddTicketsConfidentialByDefaultToServiceDeskSettings < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  enable_lock_retries!
-
   def change
     add_column :service_desk_settings, :tickets_confidential_by_default, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20240419071412_create_audit_events_streaming_group_namespace_filters.rb b/db/migrate/20240419071412_create_audit_events_streaming_group_namespace_filters.rb
index 3a1e7d36d8f..80adfc84900 100644
--- a/db/migrate/20240419071412_create_audit_events_streaming_group_namespace_filters.rb
+++ b/db/migrate/20240419071412_create_audit_events_streaming_group_namespace_filters.rb
@@ -2,7 +2,6 @@
 
 class CreateAuditEventsStreamingGroupNamespaceFilters < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  enable_lock_retries!
 
   UNIQ_INDEX_NAME = 'uniq_idx_streaming_group_destination_id_and_namespace_id'
   NAMESPACE_INDEX_NAME = 'idx_streaming_group_namespace_filters_on_namespace_id'
diff --git a/db/migrate/20240419124207_add_runner_owner_namespace_id_column_to_ci_running_builds.rb b/db/migrate/20240419124207_add_runner_owner_namespace_id_column_to_ci_running_builds.rb
index a575b867420..d3e3d30931c 100644
--- a/db/migrate/20240419124207_add_runner_owner_namespace_id_column_to_ci_running_builds.rb
+++ b/db/migrate/20240419124207_add_runner_owner_namespace_id_column_to_ci_running_builds.rb
@@ -3,8 +3,6 @@
 class AddRunnerOwnerNamespaceIdColumnToCiRunningBuilds < Gitlab::Database::Migration[2.2]
   milestone '17.0'
 
-  enable_lock_retries!
-
   def up
     add_column :ci_running_builds, :runner_owner_namespace_xid, :bigint, null: true
   end
diff --git a/db/migrate/20240429182325_create_custom_software_licenses_table.rb b/db/migrate/20240429182325_create_custom_software_licenses_table.rb
index 2706aa15349..8afea684f96 100644
--- a/db/migrate/20240429182325_create_custom_software_licenses_table.rb
+++ b/db/migrate/20240429182325_create_custom_software_licenses_table.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class CreateCustomSoftwareLicensesTable < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.0'
 
   def up
diff --git a/db/migrate/20240503173159_create_user_audit_events.rb b/db/migrate/20240503173159_create_user_audit_events.rb
index c786f16e4cc..3c870149d23 100644
--- a/db/migrate/20240503173159_create_user_audit_events.rb
+++ b/db/migrate/20240503173159_create_user_audit_events.rb
@@ -2,7 +2,6 @@
 
 class CreateUserAuditEvents < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_user_audit_events_on_author_id_created_at_id'
   USER_ID_AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_user_audit_events_on_user_id_author_created_at_id'
diff --git a/db/migrate/20240503174905_create_group_audit_events.rb b/db/migrate/20240503174905_create_group_audit_events.rb
index 0fbafe9a00d..b6b78f7012f 100644
--- a/db/migrate/20240503174905_create_group_audit_events.rb
+++ b/db/migrate/20240503174905_create_group_audit_events.rb
@@ -2,7 +2,6 @@
 
 class CreateGroupAuditEvents < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_group_audit_events_on_author_id_created_at_id'
   GROUP_ID_AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_group_audit_events_on_group_id_author_created_at_id'
diff --git a/db/migrate/20240503175347_create_project_audit_events.rb b/db/migrate/20240503175347_create_project_audit_events.rb
index 8d25a4a33e3..815cb1563d9 100644
--- a/db/migrate/20240503175347_create_project_audit_events.rb
+++ b/db/migrate/20240503175347_create_project_audit_events.rb
@@ -2,7 +2,6 @@
 
 class CreateProjectAuditEvents < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_project_audit_events_on_author_id_created_at_id'
   PROJECT_ID_AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_project_audit_events_on_project_id_author_created_at_id'
diff --git a/db/migrate/20240505153633_create_instance_audit_events.rb b/db/migrate/20240505153633_create_instance_audit_events.rb
index 358d5d75690..056a154dd30 100644
--- a/db/migrate/20240505153633_create_instance_audit_events.rb
+++ b/db/migrate/20240505153633_create_instance_audit_events.rb
@@ -2,7 +2,6 @@
 
 class CreateInstanceAuditEvents < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   AUTHOR_ID_CREATED_AT_ID_INDEX = 'idx_instance_audit_events_on_author_id_created_at_id'
 
diff --git a/db/migrate/20240519141301_add_metadata_to_member_approvals.rb b/db/migrate/20240519141301_add_metadata_to_member_approvals.rb
index 7ed3f83989c..711d103f50a 100644
--- a/db/migrate/20240519141301_add_metadata_to_member_approvals.rb
+++ b/db/migrate/20240519141301_add_metadata_to_member_approvals.rb
@@ -2,7 +2,6 @@
 
 class AddMetadataToMemberApprovals < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   def change
     add_column :member_approvals, :metadata, :jsonb, default: {}, null: false
diff --git a/db/migrate/20240528142856_add_organization_id_to_subscription_add_on_purchases.rb b/db/migrate/20240528142856_add_organization_id_to_subscription_add_on_purchases.rb
index a827a6454ab..bc0fc174ed1 100644
--- a/db/migrate/20240528142856_add_organization_id_to_subscription_add_on_purchases.rb
+++ b/db/migrate/20240528142856_add_organization_id_to_subscription_add_on_purchases.rb
@@ -5,8 +5,6 @@ class AddOrganizationIdToSubscriptionAddOnPurchases < Gitlab::Database::Migratio
 
   DEFAULT_ORGANIZATION_ID = 1
 
-  enable_lock_retries!
-
   def change
     add_column :subscription_add_on_purchases, :organization_id, :bigint, default: DEFAULT_ORGANIZATION_ID, null: false
   end
diff --git a/db/migrate/20240604051641_create_partitions_for_p_ci_build_sources.rb b/db/migrate/20240604051641_create_partitions_for_p_ci_build_sources.rb
index deda9b9b6fc..18f88e5ad61 100644
--- a/db/migrate/20240604051641_create_partitions_for_p_ci_build_sources.rb
+++ b/db/migrate/20240604051641_create_partitions_for_p_ci_build_sources.rb
@@ -3,8 +3,6 @@
 class CreatePartitionsForPCiBuildSources < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  enable_lock_retries!
-
   def up
     connection.execute(<<~SQL)
       LOCK TABLE p_ci_builds IN SHARE ROW EXCLUSIVE MODE;
diff --git a/db/migrate/20240604081941_add_approval_policy_rule_id_to_approval_group_rules.rb b/db/migrate/20240604081941_add_approval_policy_rule_id_to_approval_group_rules.rb
index 8019452d44b..c10ab3c9e18 100644
--- a/db/migrate/20240604081941_add_approval_policy_rule_id_to_approval_group_rules.rb
+++ b/db/migrate/20240604081941_add_approval_policy_rule_id_to_approval_group_rules.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyRuleIdToApprovalGroupRules < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.1'
 
   def up
diff --git a/db/migrate/20240604082005_add_approval_policy_rule_id_to_approval_project_rules.rb b/db/migrate/20240604082005_add_approval_policy_rule_id_to_approval_project_rules.rb
index 988c8f9bd81..adc67a09d8f 100644
--- a/db/migrate/20240604082005_add_approval_policy_rule_id_to_approval_project_rules.rb
+++ b/db/migrate/20240604082005_add_approval_policy_rule_id_to_approval_project_rules.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyRuleIdToApprovalProjectRules < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.1'
 
   def up
diff --git a/db/migrate/20240604082023_add_approval_policy_rule_id_to_approval_merge_request_rules.rb b/db/migrate/20240604082023_add_approval_policy_rule_id_to_approval_merge_request_rules.rb
index 1513677f65b..5b27b7cea20 100644
--- a/db/migrate/20240604082023_add_approval_policy_rule_id_to_approval_merge_request_rules.rb
+++ b/db/migrate/20240604082023_add_approval_policy_rule_id_to_approval_merge_request_rules.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyRuleIdToApprovalMergeRequestRules < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.1'
 
   def up
diff --git a/db/migrate/20240604082113_add_approval_policy_rule_id_to_software_license_policies.rb b/db/migrate/20240604082113_add_approval_policy_rule_id_to_software_license_policies.rb
index 86ee939dcb6..fa11750b9b7 100644
--- a/db/migrate/20240604082113_add_approval_policy_rule_id_to_software_license_policies.rb
+++ b/db/migrate/20240604082113_add_approval_policy_rule_id_to_software_license_policies.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyRuleIdToSoftwareLicensePolicies < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.1'
 
   def up
diff --git a/db/migrate/20240604082344_add_approval_policy_rule_id_to_scan_result_policy_violations.rb b/db/migrate/20240604082344_add_approval_policy_rule_id_to_scan_result_policy_violations.rb
index a9aecbbfff0..6fd8f562ec4 100644
--- a/db/migrate/20240604082344_add_approval_policy_rule_id_to_scan_result_policy_violations.rb
+++ b/db/migrate/20240604082344_add_approval_policy_rule_id_to_scan_result_policy_violations.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyRuleIdToScanResultPolicyViolations < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.1'
 
   def up
diff --git a/db/migrate/20240606124806_add_organization_id_to_snippets.rb b/db/migrate/20240606124806_add_organization_id_to_snippets.rb
index e781036c95a..fdd29e435fd 100644
--- a/db/migrate/20240606124806_add_organization_id_to_snippets.rb
+++ b/db/migrate/20240606124806_add_organization_id_to_snippets.rb
@@ -5,8 +5,6 @@ class AddOrganizationIdToSnippets < Gitlab::Database::Migration[2.2]
 
   milestone '17.2'
 
-  enable_lock_retries!
-
   def change
     add_column :snippets, :organization_id, :bigint, default: DEFAULT_ORGANIZATION_ID, null: true
   end
diff --git a/db/migrate/20240607035355_add_member_role_id_to_ldap_group_links.rb b/db/migrate/20240607035355_add_member_role_id_to_ldap_group_links.rb
index 47a3abc1315..6db017f6e08 100644
--- a/db/migrate/20240607035355_add_member_role_id_to_ldap_group_links.rb
+++ b/db/migrate/20240607035355_add_member_role_id_to_ldap_group_links.rb
@@ -2,7 +2,6 @@
 
 class AddMemberRoleIdToLdapGroupLinks < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   def change
     add_column :ldap_group_links, :member_role_id, :bigint
diff --git a/db/migrate/20240612034702_create_import_source_user_placeholder_reference.rb b/db/migrate/20240612034702_create_import_source_user_placeholder_reference.rb
index 0364d632200..18ba47eb580 100644
--- a/db/migrate/20240612034702_create_import_source_user_placeholder_reference.rb
+++ b/db/migrate/20240612034702_create_import_source_user_placeholder_reference.rb
@@ -3,8 +3,6 @@
 class CreateImportSourceUserPlaceholderReference < Gitlab::Database::Migration[2.2]
   milestone '17.2'
 
-  enable_lock_retries!
-
   INDEX_NAME = 'index_import_source_user_placeholder_references_on_source_user_'
 
   def change
diff --git a/db/migrate/20240625050115_add_member_role_id_to_group_group_links.rb b/db/migrate/20240625050115_add_member_role_id_to_group_group_links.rb
index c60931e7ba2..c17d003ef3b 100644
--- a/db/migrate/20240625050115_add_member_role_id_to_group_group_links.rb
+++ b/db/migrate/20240625050115_add_member_role_id_to_group_group_links.rb
@@ -2,7 +2,6 @@
 
 class AddMemberRoleIdToGroupGroupLinks < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  enable_lock_retries!
 
   def change
     add_column :group_group_links, :member_role_id, :bigint, if_not_exists: true
diff --git a/db/migrate/20240627055916_add_uploaded_by_user_id_to_uploads.rb b/db/migrate/20240627055916_add_uploaded_by_user_id_to_uploads.rb
index 63b7ddfa427..06b0ed8de06 100644
--- a/db/migrate/20240627055916_add_uploaded_by_user_id_to_uploads.rb
+++ b/db/migrate/20240627055916_add_uploaded_by_user_id_to_uploads.rb
@@ -2,7 +2,6 @@
 
 class AddUploadedByUserIdToUploads < Gitlab::Database::Migration[2.2]
   milestone '17.2'
-  enable_lock_retries!
 
   def change
     add_column :uploads, :uploaded_by_user_id, :bigint
diff --git a/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb b/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
index d3df647d575..f4c8aad65ab 100644
--- a/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
+++ b/db/migrate/20240628203616_update_scheduled_scans_max_concurrency_in_application_settings_for_self_managed.rb
@@ -2,7 +2,6 @@
 
 class UpdateScheduledScansMaxConcurrencyInApplicationSettingsForSelfManaged < Gitlab::Database::Migration[2.2]
   restrict_gitlab_migration gitlab_schema: :gitlab_main
-  enable_lock_retries!
 
   milestone '17.2'
 
diff --git a/db/migrate/20240701153843_add_work_items_dates_sources_sync_to_issues_trigger.rb b/db/migrate/20240701153843_add_work_items_dates_sources_sync_to_issues_trigger.rb
index 6e6b8703f82..1ce353cb4b1 100644
--- a/db/migrate/20240701153843_add_work_items_dates_sources_sync_to_issues_trigger.rb
+++ b/db/migrate/20240701153843_add_work_items_dates_sources_sync_to_issues_trigger.rb
@@ -5,8 +5,6 @@ class AddWorkItemsDatesSourcesSyncToIssuesTrigger < Gitlab::Database::Migration[
 
   include Gitlab::Database::SchemaHelpers
 
-  enable_lock_retries!
-
   WORK_ITEM_DATES_SOURCE_TABLE_NAME = 'work_item_dates_sources'
 
   TRIGGER_FUNCTION_NAME = 'sync_issues_dates_with_work_item_dates_sources'
diff --git a/db/migrate/20240703043908_create_table_p_ci_build_tags.rb b/db/migrate/20240703043908_create_table_p_ci_build_tags.rb
index 528dcb27d95..fa96c88f193 100644
--- a/db/migrate/20240703043908_create_table_p_ci_build_tags.rb
+++ b/db/migrate/20240703043908_create_table_p_ci_build_tags.rb
@@ -3,8 +3,6 @@
 class CreateTablePCiBuildTags < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   OPTIONS = {
     if_not_exists: true,
     options: 'PARTITION BY LIST (partition_id)',
diff --git a/db/migrate/20240703054001_ensure_unique_id_for_p_ci_build_tags.rb b/db/migrate/20240703054001_ensure_unique_id_for_p_ci_build_tags.rb
index 7b6c8735074..f2fc25b4c63 100644
--- a/db/migrate/20240703054001_ensure_unique_id_for_p_ci_build_tags.rb
+++ b/db/migrate/20240703054001_ensure_unique_id_for_p_ci_build_tags.rb
@@ -5,8 +5,6 @@ class EnsureUniqueIdForPCiBuildTags < Gitlab::Database::Migration[2.2]
 
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE_NAME = :p_ci_build_tags
   SEQ_NAME = :p_ci_build_tags_id_seq
 
diff --git a/db/migrate/20240703082453_create_partitions_for_p_ci_build_tags.rb b/db/migrate/20240703082453_create_partitions_for_p_ci_build_tags.rb
index 862bc88cd64..7fc19b3295e 100644
--- a/db/migrate/20240703082453_create_partitions_for_p_ci_build_tags.rb
+++ b/db/migrate/20240703082453_create_partitions_for_p_ci_build_tags.rb
@@ -3,8 +3,6 @@
 class CreatePartitionsForPCiBuildTags < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   def up
     connection.execute(<<~SQL)
       LOCK TABLE p_ci_builds IN SHARE ROW EXCLUSIVE MODE;
diff --git a/db/migrate/20240705020837_add_last_access_from_pipl_country_at_to_users.rb b/db/migrate/20240705020837_add_last_access_from_pipl_country_at_to_users.rb
index 4966538e03b..8b4fd978abc 100644
--- a/db/migrate/20240705020837_add_last_access_from_pipl_country_at_to_users.rb
+++ b/db/migrate/20240705020837_add_last_access_from_pipl_country_at_to_users.rb
@@ -2,7 +2,6 @@
 
 class AddLastAccessFromPiplCountryAtToUsers < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  enable_lock_retries!
 
   # This column prevents additional queries (e.g. 'SELECT ... FROM
   # country_access_logs ...') when checking if the user's access from a specific
diff --git a/db/migrate/20240717140800_add_encrypted_shared_secret_to_external_status_checks.rb b/db/migrate/20240717140800_add_encrypted_shared_secret_to_external_status_checks.rb
index cc8288850e0..0175263a133 100644
--- a/db/migrate/20240717140800_add_encrypted_shared_secret_to_external_status_checks.rb
+++ b/db/migrate/20240717140800_add_encrypted_shared_secret_to_external_status_checks.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddEncryptedSharedSecretToExternalStatusChecks < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.3'
 
   def change
diff --git a/db/migrate/20240719090901_add_plan_id_to_ci_pending_builds.rb b/db/migrate/20240719090901_add_plan_id_to_ci_pending_builds.rb
index c8b5b0e5220..d74c3e06e45 100644
--- a/db/migrate/20240719090901_add_plan_id_to_ci_pending_builds.rb
+++ b/db/migrate/20240719090901_add_plan_id_to_ci_pending_builds.rb
@@ -3,8 +3,6 @@
 class AddPlanIdToCiPendingBuilds < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  enable_lock_retries!
-
   def change
     add_column :ci_pending_builds, :plan_id, :integer, null: true
   end
diff --git a/db/migrate/20240719090902_add_allowed_plan_ids_to_ci_runners.rb b/db/migrate/20240719090902_add_allowed_plan_ids_to_ci_runners.rb
index e698b36cd9a..15f0fd10bb9 100644
--- a/db/migrate/20240719090902_add_allowed_plan_ids_to_ci_runners.rb
+++ b/db/migrate/20240719090902_add_allowed_plan_ids_to_ci_runners.rb
@@ -3,8 +3,6 @@
 class AddAllowedPlanIdsToCiRunners < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  enable_lock_retries!
-
   def change
     add_column :ci_runners, :allowed_plan_ids, :integer, array: true, null: false, default: []
   end
diff --git a/db/migrate/20240725154651_add_project_id_to_packages_dependencies.rb b/db/migrate/20240725154651_add_project_id_to_packages_dependencies.rb
index bf1e85f8b5c..4214e3c836f 100644
--- a/db/migrate/20240725154651_add_project_id_to_packages_dependencies.rb
+++ b/db/migrate/20240725154651_add_project_id_to_packages_dependencies.rb
@@ -2,7 +2,6 @@
 
 class AddProjectIdToPackagesDependencies < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  enable_lock_retries!
 
   def change
     add_column :packages_dependencies, :project_id, :bigint
diff --git a/db/migrate/20240813095256_add_disable_password_authentication_for_enterprise_users_to_saml_providers.rb b/db/migrate/20240813095256_add_disable_password_authentication_for_enterprise_users_to_saml_providers.rb
index c33f50a2c3d..b51ff349533 100644
--- a/db/migrate/20240813095256_add_disable_password_authentication_for_enterprise_users_to_saml_providers.rb
+++ b/db/migrate/20240813095256_add_disable_password_authentication_for_enterprise_users_to_saml_providers.rb
@@ -3,8 +3,6 @@
 class AddDisablePasswordAuthenticationForEnterpriseUsersToSamlProviders < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  enable_lock_retries!
-
   def change
     add_column :saml_providers, :disable_password_authentication_for_enterprise_users, :boolean, default: false
   end
diff --git a/db/migrate/20240813170304_allow_null_for_upstream_id_in_virtual_registries_packages_maven_cached_responses.rb b/db/migrate/20240813170304_allow_null_for_upstream_id_in_virtual_registries_packages_maven_cached_responses.rb
index 9fa92c53c99..0fe304bb553 100644
--- a/db/migrate/20240813170304_allow_null_for_upstream_id_in_virtual_registries_packages_maven_cached_responses.rb
+++ b/db/migrate/20240813170304_allow_null_for_upstream_id_in_virtual_registries_packages_maven_cached_responses.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AllowNullForUpstreamIdInVirtualRegistriesPackagesMavenCachedResponses < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.4'
 
   def change
diff --git a/db/migrate/20240816040224_create_import_member_placeholder_references.rb b/db/migrate/20240816040224_create_import_member_placeholder_references.rb
index f48be94d33d..431ce2a25b2 100644
--- a/db/migrate/20240816040224_create_import_member_placeholder_references.rb
+++ b/db/migrate/20240816040224_create_import_member_placeholder_references.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class CreateImportMemberPlaceholderReferences < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '17.4'
 
   def change
diff --git a/db/migrate/20240816061320_allow_top_level_group_owners_to_create_service_accounts.rb b/db/migrate/20240816061320_allow_top_level_group_owners_to_create_service_accounts.rb
index d5a060e97de..c1d362d678d 100644
--- a/db/migrate/20240816061320_allow_top_level_group_owners_to_create_service_accounts.rb
+++ b/db/migrate/20240816061320_allow_top_level_group_owners_to_create_service_accounts.rb
@@ -3,8 +3,6 @@
 class AllowTopLevelGroupOwnersToCreateServiceAccounts < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  enable_lock_retries!
-
   def change
     add_column :application_settings,
       :allow_top_level_group_owners_to_create_service_accounts,
diff --git a/db/migrate/20240819104531_add_observability_backend_ssl_verification_enabled_to_application_settings.rb b/db/migrate/20240819104531_add_observability_backend_ssl_verification_enabled_to_application_settings.rb
index da366cef38c..57c9772eeac 100644
--- a/db/migrate/20240819104531_add_observability_backend_ssl_verification_enabled_to_application_settings.rb
+++ b/db/migrate/20240819104531_add_observability_backend_ssl_verification_enabled_to_application_settings.rb
@@ -3,8 +3,6 @@
 class AddObservabilityBackendSslVerificationEnabledToApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  enable_lock_retries!
-
   def change
     add_column :application_settings, :observability_backend_ssl_verification_enabled, :boolean, null: false,
       default: true
diff --git a/db/migrate/20240828103148_add_spp_repository_pipeline_access_to_project_settings.rb b/db/migrate/20240828103148_add_spp_repository_pipeline_access_to_project_settings.rb
index 2d1c274ab38..10e14b02519 100644
--- a/db/migrate/20240828103148_add_spp_repository_pipeline_access_to_project_settings.rb
+++ b/db/migrate/20240828103148_add_spp_repository_pipeline_access_to_project_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddSppRepositoryPipelineAccessToProjectSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.4'
 
   def change
diff --git a/db/migrate/20240829125828_change_time_estimate_default_from_null_to_zero_on_issues.rb b/db/migrate/20240829125828_change_time_estimate_default_from_null_to_zero_on_issues.rb
index cba1b5da291..054ec7ddb73 100644
--- a/db/migrate/20240829125828_change_time_estimate_default_from_null_to_zero_on_issues.rb
+++ b/db/migrate/20240829125828_change_time_estimate_default_from_null_to_zero_on_issues.rb
@@ -2,7 +2,6 @@
 
 class ChangeTimeEstimateDefaultFromNullToZeroOnIssues < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  enable_lock_retries!
 
   TABLE_NAME = :issues
   COLUMN_NAME = :time_estimate
diff --git a/db/migrate/20240829125928_change_time_estimate_default_from_null_to_zero_on_merge_requests.rb b/db/migrate/20240829125928_change_time_estimate_default_from_null_to_zero_on_merge_requests.rb
index cf193dbb4b0..97a57ad3477 100644
--- a/db/migrate/20240829125928_change_time_estimate_default_from_null_to_zero_on_merge_requests.rb
+++ b/db/migrate/20240829125928_change_time_estimate_default_from_null_to_zero_on_merge_requests.rb
@@ -2,7 +2,6 @@
 
 class ChangeTimeEstimateDefaultFromNullToZeroOnMergeRequests < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  enable_lock_retries!
 
   TABLE_NAME = :merge_requests
   COLUMN_NAME = :time_estimate
diff --git a/db/migrate/20240904133620_add_spp_repository_pipeline_access_cascading_setting.rb b/db/migrate/20240904133620_add_spp_repository_pipeline_access_cascading_setting.rb
index 051f9fd2754..6d22c3c3399 100644
--- a/db/migrate/20240904133620_add_spp_repository_pipeline_access_cascading_setting.rb
+++ b/db/migrate/20240904133620_add_spp_repository_pipeline_access_cascading_setting.rb
@@ -3,8 +3,6 @@
 class AddSppRepositoryPipelineAccessCascadingSetting < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::MigrationHelpers::CascadingNamespaceSettings
 
-  enable_lock_retries!
-
   milestone '17.4'
 
   def up
diff --git a/db/migrate/20240905124106_add_policy_action_limit_application_setting.rb b/db/migrate/20240905124106_add_policy_action_limit_application_setting.rb
index 5992c5abfc5..2728ed8be9a 100644
--- a/db/migrate/20240905124106_add_policy_action_limit_application_setting.rb
+++ b/db/migrate/20240905124106_add_policy_action_limit_application_setting.rb
@@ -3,8 +3,6 @@
 class AddPolicyActionLimitApplicationSetting < Gitlab::Database::Migration[2.2]
   milestone '17.4'
 
-  enable_lock_retries!
-
   def change
     add_column :application_settings, :security_policies, :jsonb, default: {}, null: false
   end
diff --git a/db/migrate/20240917054235_create_wiki_page_user_mentions.rb b/db/migrate/20240917054235_create_wiki_page_user_mentions.rb
index 87348128997..d554f414a67 100644
--- a/db/migrate/20240917054235_create_wiki_page_user_mentions.rb
+++ b/db/migrate/20240917054235_create_wiki_page_user_mentions.rb
@@ -4,8 +4,6 @@
 # for more information on how to write migrations for GitLab.
 
 class CreateWikiPageUserMentions < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '17.5'
 
   def up
diff --git a/db/migrate/20240923130542_add_sharding_key_id_to_ci_runners.rb b/db/migrate/20240923130542_add_sharding_key_id_to_ci_runners.rb
index 45c1c6b478e..efdb1061e68 100644
--- a/db/migrate/20240923130542_add_sharding_key_id_to_ci_runners.rb
+++ b/db/migrate/20240923130542_add_sharding_key_id_to_ci_runners.rb
@@ -2,7 +2,6 @@
 
 class AddShardingKeyIdToCiRunners < Gitlab::Database::Migration[2.2]
   milestone '17.5'
-  enable_lock_retries!
 
   def up
     add_column :ci_runners, :sharding_key_id, :bigint, null: true, if_not_exists: true
diff --git a/db/migrate/20241008101731_create_catalog_resource_component_last_usages_table.rb b/db/migrate/20241008101731_create_catalog_resource_component_last_usages_table.rb
index b9cd4eb82ab..e5a9e0ae148 100644
--- a/db/migrate/20241008101731_create_catalog_resource_component_last_usages_table.rb
+++ b/db/migrate/20241008101731_create_catalog_resource_component_last_usages_table.rb
@@ -3,8 +3,6 @@
 class CreateCatalogResourceComponentLastUsagesTable < Gitlab::Database::Migration[2.2]
   milestone '17.6'
 
-  enable_lock_retries!
-
   CATALOG_RESOURCE_INDEX_NAME = 'idx_cpmt_last_usages_on_catalog_resource_id'
   UNIQUE_INDEX_NAME = 'idx_usages_on_cmpt_used_by_project_cmpt_and_last_used_date'
   PROJECT_INDEX_NAME = 'idx_catalog_resource_cpmt_last_usages_on_cpmt_project_id'
diff --git a/db/migrate/20241016125024_add_metadata_to_zoekt_indices.rb b/db/migrate/20241016125024_add_metadata_to_zoekt_indices.rb
index b3e006fc909..c224018a7af 100644
--- a/db/migrate/20241016125024_add_metadata_to_zoekt_indices.rb
+++ b/db/migrate/20241016125024_add_metadata_to_zoekt_indices.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddMetadataToZoektIndices < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.6'
 
   def change
diff --git a/db/migrate/20241022141656_add_policy_tuning_to_policies.rb b/db/migrate/20241022141656_add_policy_tuning_to_policies.rb
index 3c4e6c86562..3d84de8e418 100644
--- a/db/migrate/20241022141656_add_policy_tuning_to_policies.rb
+++ b/db/migrate/20241022141656_add_policy_tuning_to_policies.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddPolicyTuningToPolicies < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.6'
 
   def change
diff --git a/db/migrate/20241030031829_add_resource_usage_limits_to_application_settings.rb b/db/migrate/20241030031829_add_resource_usage_limits_to_application_settings.rb
index 233a606136a..00ee17c5456 100644
--- a/db/migrate/20241030031829_add_resource_usage_limits_to_application_settings.rb
+++ b/db/migrate/20241030031829_add_resource_usage_limits_to_application_settings.rb
@@ -2,7 +2,6 @@
 
 class AddResourceUsageLimitsToApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  enable_lock_retries!
 
   def change
     add_column :application_settings, :resource_usage_limits, :jsonb, default: {}, null: false
diff --git a/db/migrate/20241104224549_add_allow_list_integrations_settings_to_application_settings.rb b/db/migrate/20241104224549_add_allow_list_integrations_settings_to_application_settings.rb
index e4d03b46dd2..aca66667a08 100644
--- a/db/migrate/20241104224549_add_allow_list_integrations_settings_to_application_settings.rb
+++ b/db/migrate/20241104224549_add_allow_list_integrations_settings_to_application_settings.rb
@@ -2,7 +2,6 @@
 
 class AddAllowListIntegrationsSettingsToApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.6'
-  enable_lock_retries!
 
   def change
     add_column :application_settings, :integrations, :jsonb, default: {}, null: false
diff --git a/db/migrate/20241107131541_add_user_seat_management_to_application_settings.rb b/db/migrate/20241107131541_add_user_seat_management_to_application_settings.rb
index d35ad90669b..bd0a89be6af 100644
--- a/db/migrate/20241107131541_add_user_seat_management_to_application_settings.rb
+++ b/db/migrate/20241107131541_add_user_seat_management_to_application_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddUserSeatManagementToApplicationSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.6'
 
   def change
diff --git a/db/migrate/20241112123436_update_seat_control_in_application_settings.rb b/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
index 1d42f302dce..0e486249818 100644
--- a/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
+++ b/db/migrate/20241112123436_update_seat_control_in_application_settings.rb
@@ -3,8 +3,6 @@
 class UpdateSeatControlInApplicationSettings < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  enable_lock_retries!
-
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
   def up
diff --git a/db/migrate/20241115075017_add_member_role_id_to_project_group_links.rb b/db/migrate/20241115075017_add_member_role_id_to_project_group_links.rb
index eb591c7e3b3..086e13fafa6 100644
--- a/db/migrate/20241115075017_add_member_role_id_to_project_group_links.rb
+++ b/db/migrate/20241115075017_add_member_role_id_to_project_group_links.rb
@@ -2,7 +2,6 @@
 
 class AddMemberRoleIdToProjectGroupLinks < Gitlab::Database::Migration[2.2]
   milestone '17.7'
-  enable_lock_retries!
 
   def change
     add_column :project_group_links, :member_role_id, :bigint, if_not_exists: true
diff --git a/db/migrate/20241122121328_add_approval_policy_action_idx_to_approval_project_rules.rb b/db/migrate/20241122121328_add_approval_policy_action_idx_to_approval_project_rules.rb
index 773396cc334..43c5d03f26a 100644
--- a/db/migrate/20241122121328_add_approval_policy_action_idx_to_approval_project_rules.rb
+++ b/db/migrate/20241122121328_add_approval_policy_action_idx_to_approval_project_rules.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyActionIdxToApprovalProjectRules < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.7'
 
   def change
diff --git a/db/migrate/20241122121350_add_approval_policy_action_idx_to_approval_merge_request_rules.rb b/db/migrate/20241122121350_add_approval_policy_action_idx_to_approval_merge_request_rules.rb
index 36191ade328..3f22b13f924 100644
--- a/db/migrate/20241122121350_add_approval_policy_action_idx_to_approval_merge_request_rules.rb
+++ b/db/migrate/20241122121350_add_approval_policy_action_idx_to_approval_merge_request_rules.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddApprovalPolicyActionIdxToApprovalMergeRequestRules < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.7'
 
   def change
diff --git a/db/migrate/20241122121652_add_action_idx_to_scan_result_policies.rb b/db/migrate/20241122121652_add_action_idx_to_scan_result_policies.rb
index 7c55bb4fcf8..27488966351 100644
--- a/db/migrate/20241122121652_add_action_idx_to_scan_result_policies.rb
+++ b/db/migrate/20241122121652_add_action_idx_to_scan_result_policies.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddActionIdxToScanResultPolicies < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.7'
 
   def change
diff --git a/db/migrate/20241201162318_add_custom_roles_to_scan_result_policies.rb b/db/migrate/20241201162318_add_custom_roles_to_scan_result_policies.rb
index b36b237e0a6..870db33be33 100644
--- a/db/migrate/20241201162318_add_custom_roles_to_scan_result_policies.rb
+++ b/db/migrate/20241201162318_add_custom_roles_to_scan_result_policies.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddCustomRolesToScanResultPolicies < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.7'
 
   def change
diff --git a/db/migrate/20241202054640_add_vulnerability_events_to_web_hooks.rb b/db/migrate/20241202054640_add_vulnerability_events_to_web_hooks.rb
index 2c367bc9cef..17184191706 100644
--- a/db/migrate/20241202054640_add_vulnerability_events_to_web_hooks.rb
+++ b/db/migrate/20241202054640_add_vulnerability_events_to_web_hooks.rb
@@ -3,8 +3,6 @@
 class AddVulnerabilityEventsToWebHooks < Gitlab::Database::Migration[2.2]
   milestone '17.7'
 
-  enable_lock_retries!
-
   def change
     add_column :web_hooks, :vulnerability_events, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20250108062227_add_extended_grat_expiry_webhook_execute_to_namespace_settings.rb b/db/migrate/20250108062227_add_extended_grat_expiry_webhook_execute_to_namespace_settings.rb
index 2dcde52a094..7d79a513d0f 100644
--- a/db/migrate/20250108062227_add_extended_grat_expiry_webhook_execute_to_namespace_settings.rb
+++ b/db/migrate/20250108062227_add_extended_grat_expiry_webhook_execute_to_namespace_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddExtendedGratExpiryWebhookExecuteToNamespaceSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.9'
 
   def change
diff --git a/db/migrate/20250108062256_add_extended_prat_expiry_webhook_execute_to_project_settings.rb b/db/migrate/20250108062256_add_extended_prat_expiry_webhook_execute_to_project_settings.rb
index f739f87b16d..e474e1c5e7d 100644
--- a/db/migrate/20250108062256_add_extended_prat_expiry_webhook_execute_to_project_settings.rb
+++ b/db/migrate/20250108062256_add_extended_prat_expiry_webhook_execute_to_project_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddExtendedPratExpiryWebhookExecuteToProjectSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.9'
 
   def change
diff --git a/db/migrate/20250109102301_add_o11y_settings_to_application_settings.rb b/db/migrate/20250109102301_add_o11y_settings_to_application_settings.rb
index 3a6c3bad0a4..f11d4f4a605 100644
--- a/db/migrate/20250109102301_add_o11y_settings_to_application_settings.rb
+++ b/db/migrate/20250109102301_add_o11y_settings_to_application_settings.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class AddO11ySettingsToApplicationSettings < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.8'
 
   def change
diff --git a/db/migrate/20250210225045_add_vscode_extension_marketplace_to_application_setting.rb b/db/migrate/20250210225045_add_vscode_extension_marketplace_to_application_setting.rb
index ef7e52c8e14..9cbb961aafc 100644
--- a/db/migrate/20250210225045_add_vscode_extension_marketplace_to_application_setting.rb
+++ b/db/migrate/20250210225045_add_vscode_extension_marketplace_to_application_setting.rb
@@ -2,7 +2,6 @@
 
 class AddVSCodeExtensionMarketplaceToApplicationSetting < Gitlab::Database::Migration[2.2]
   milestone '17.9'
-  enable_lock_retries!
 
   def change
     add_column :application_settings, :vscode_extension_marketplace, :jsonb, default: {}, null: false
diff --git a/db/migrate/20250227095537_add_organization_id_to_fork_networks.rb b/db/migrate/20250227095537_add_organization_id_to_fork_networks.rb
index bd62094bd62..08ea11ef1c4 100644
--- a/db/migrate/20250227095537_add_organization_id_to_fork_networks.rb
+++ b/db/migrate/20250227095537_add_organization_id_to_fork_networks.rb
@@ -3,8 +3,6 @@
 class AddOrganizationIdToForkNetworks < Gitlab::Database::Migration[2.2]
   milestone '17.10'
 
-  enable_lock_retries!
-
   def change
     add_column :fork_networks, :organization_id, :bigint, null: true
   end
diff --git a/db/migrate/20250313142550_add_job_token_policies_enabled_column_to_namespace_settings.rb b/db/migrate/20250313142550_add_job_token_policies_enabled_column_to_namespace_settings.rb
index 7b966993cac..2d4ef4ebf8b 100644
--- a/db/migrate/20250313142550_add_job_token_policies_enabled_column_to_namespace_settings.rb
+++ b/db/migrate/20250313142550_add_job_token_policies_enabled_column_to_namespace_settings.rb
@@ -2,7 +2,6 @@
 
 class AddJobTokenPoliciesEnabledColumnToNamespaceSettings < Gitlab::Database::Migration[2.2]
   milestone '17.11'
-  enable_lock_retries!
 
   def change
     add_column :namespace_settings, :job_token_policies_enabled, :boolean, default: false, null: false
diff --git a/db/migrate/20250320072111_add_security_policies_namespace_setting.rb b/db/migrate/20250320072111_add_security_policies_namespace_setting.rb
index e7b1512e658..4169f6d2f95 100644
--- a/db/migrate/20250320072111_add_security_policies_namespace_setting.rb
+++ b/db/migrate/20250320072111_add_security_policies_namespace_setting.rb
@@ -3,8 +3,6 @@
 class AddSecurityPoliciesNamespaceSetting < Gitlab::Database::Migration[2.2]
   milestone '17.11'
 
-  enable_lock_retries!
-
   def change
     add_column :namespace_settings, :security_policies, :jsonb, default: {}, null: false
   end
diff --git a/db/migrate/20250320103054_add_organization_id_to_subscription_seat_assignments.rb b/db/migrate/20250320103054_add_organization_id_to_subscription_seat_assignments.rb
index 89a6f7808e3..32b3fdd46f9 100644
--- a/db/migrate/20250320103054_add_organization_id_to_subscription_seat_assignments.rb
+++ b/db/migrate/20250320103054_add_organization_id_to_subscription_seat_assignments.rb
@@ -4,7 +4,6 @@ class AddOrganizationIdToSubscriptionSeatAssignments < Gitlab::Database::Migrati
   milestone '17.11'
 
   DEFAULT_ORGANIZATION_ID = 1
-  enable_lock_retries!
 
   def change
     add_column :subscription_seat_assignments, :organization_id, :bigint, default: DEFAULT_ORGANIZATION_ID, null: false
diff --git a/db/migrate/20250325071830_add_member_approval_events_to_web_hooks.rb b/db/migrate/20250325071830_add_member_approval_events_to_web_hooks.rb
index 4ad9f502dba..af73e156824 100644
--- a/db/migrate/20250325071830_add_member_approval_events_to_web_hooks.rb
+++ b/db/migrate/20250325071830_add_member_approval_events_to_web_hooks.rb
@@ -2,7 +2,6 @@
 
 class AddMemberApprovalEventsToWebHooks < Gitlab::Database::Migration[2.2]
   milestone '17.11'
-  enable_lock_retries!
 
   def change
     add_column :web_hooks, :member_approval_events, :boolean, null: false, default: false
diff --git a/db/migrate/20250623010727_initialize_conversion_of_deployment_clusters_to_bigint.rb b/db/migrate/20250623010727_initialize_conversion_of_deployment_clusters_to_bigint.rb
new file mode 100644
index 00000000000..3338da0d054
--- /dev/null
+++ b/db/migrate/20250623010727_initialize_conversion_of_deployment_clusters_to_bigint.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class InitializeConversionOfDeploymentClustersToBigint < Gitlab::Database::Migration[2.3]
+  disable_ddl_transaction!
+  milestone '18.2'
+
+  TABLE = :deployment_clusters
+  COLUMNS = %i[deployment_id cluster_id]
+
+  def up
+    initialize_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+
+  def down
+    revert_initialize_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+end
diff --git a/db/post_migrate/20240205170838_change_approval_merge_request_rules_vulnerability_states_default.rb b/db/post_migrate/20240205170838_change_approval_merge_request_rules_vulnerability_states_default.rb
index d342c9afd69..e677f09372c 100644
--- a/db/post_migrate/20240205170838_change_approval_merge_request_rules_vulnerability_states_default.rb
+++ b/db/post_migrate/20240205170838_change_approval_merge_request_rules_vulnerability_states_default.rb
@@ -2,7 +2,6 @@
 
 class ChangeApprovalMergeRequestRulesVulnerabilityStatesDefault < Gitlab::Database::Migration[2.2]
   milestone '16.9'
-  enable_lock_retries!
 
   def up
     change_column_default('approval_merge_request_rules', 'vulnerability_states', from: ['newly_detected'],
diff --git a/db/post_migrate/20240205171942_change_approval_project_rules_vulnerability_states_default.rb b/db/post_migrate/20240205171942_change_approval_project_rules_vulnerability_states_default.rb
index 6edad4c0e2e..d7d5d06b5c6 100644
--- a/db/post_migrate/20240205171942_change_approval_project_rules_vulnerability_states_default.rb
+++ b/db/post_migrate/20240205171942_change_approval_project_rules_vulnerability_states_default.rb
@@ -3,8 +3,6 @@
 class ChangeApprovalProjectRulesVulnerabilityStatesDefault < Gitlab::Database::Migration[2.2]
   milestone '16.9'
 
-  enable_lock_retries!
-
   def up
     change_column_default('approval_project_rules', 'vulnerability_states', from: ['newly_detected'],
       to: %w[new_needs_triage new_dismissed])
diff --git a/db/post_migrate/20240318180554_drop_promote_ultimate_features_at_column.rb b/db/post_migrate/20240318180554_drop_promote_ultimate_features_at_column.rb
index 423a491e64f..451d859744c 100644
--- a/db/post_migrate/20240318180554_drop_promote_ultimate_features_at_column.rb
+++ b/db/post_migrate/20240318180554_drop_promote_ultimate_features_at_column.rb
@@ -3,8 +3,6 @@
 class DropPromoteUltimateFeaturesAtColumn < Gitlab::Database::Migration[2.2]
   milestone '16.11'
 
-  enable_lock_retries!
-
   def change
     remove_column :onboarding_progresses, :promote_ultimate_features_at, :datetime_with_timezone
   end
diff --git a/db/post_migrate/20240408135652_drop_external_approval_rules_protected_branches_table.rb b/db/post_migrate/20240408135652_drop_external_approval_rules_protected_branches_table.rb
index e59541e675a..3517676cbb4 100644
--- a/db/post_migrate/20240408135652_drop_external_approval_rules_protected_branches_table.rb
+++ b/db/post_migrate/20240408135652_drop_external_approval_rules_protected_branches_table.rb
@@ -2,7 +2,6 @@
 
 class DropExternalApprovalRulesProtectedBranchesTable < Gitlab::Database::Migration[2.2]
   milestone '17.0'
-  enable_lock_retries!
 
   def up
     drop_table :external_approval_rules_protected_branches
diff --git a/db/post_migrate/20240513042657_cleanup_bigint_conversions_for_ci_pipelines.rb b/db/post_migrate/20240513042657_cleanup_bigint_conversions_for_ci_pipelines.rb
index 3ae9efa83ec..769e5a70f3a 100644
--- a/db/post_migrate/20240513042657_cleanup_bigint_conversions_for_ci_pipelines.rb
+++ b/db/post_migrate/20240513042657_cleanup_bigint_conversions_for_ci_pipelines.rb
@@ -2,7 +2,6 @@
 
 class CleanupBigintConversionsForCiPipelines < Gitlab::Database::Migration[2.2]
   milestone '17.1'
-  enable_lock_retries!
 
   TABLE = :ci_pipelines
   COLUMNS = %i[id]
diff --git a/db/post_migrate/20240513065051_ensure_id_uniqueness_for_p_ci_builds_execution_configs.rb b/db/post_migrate/20240513065051_ensure_id_uniqueness_for_p_ci_builds_execution_configs.rb
index 632d04d5a2b..635d713c85b 100644
--- a/db/post_migrate/20240513065051_ensure_id_uniqueness_for_p_ci_builds_execution_configs.rb
+++ b/db/post_migrate/20240513065051_ensure_id_uniqueness_for_p_ci_builds_execution_configs.rb
@@ -4,7 +4,6 @@ class EnsureIdUniquenessForPCiBuildsExecutionConfigs < Gitlab::Database::Migrati
   include Gitlab::Database::PartitioningMigrationHelpers::UniquenessHelpers
 
   milestone '17.1'
-  enable_lock_retries!
 
   TABLE_NAME = :p_ci_builds_execution_configs
   SEQ_NAME = :p_ci_builds_execution_configs_id_seq
diff --git a/db/post_migrate/20240528115140_change_projects_organization_id_default.rb b/db/post_migrate/20240528115140_change_projects_organization_id_default.rb
index e24e7047c67..ce4c2b0c804 100644
--- a/db/post_migrate/20240528115140_change_projects_organization_id_default.rb
+++ b/db/post_migrate/20240528115140_change_projects_organization_id_default.rb
@@ -3,8 +3,6 @@
 class ChangeProjectsOrganizationIdDefault < Gitlab::Database::Migration[2.2]
   milestone '17.1'
 
-  enable_lock_retries!
-
   def up
     change_column_default(:projects, :organization_id, nil)
   end
diff --git a/db/post_migrate/20240627165253_drop_token_with_ivs_table.rb b/db/post_migrate/20240627165253_drop_token_with_ivs_table.rb
index fb4cd9a7ce4..8d0c76ad873 100644
--- a/db/post_migrate/20240627165253_drop_token_with_ivs_table.rb
+++ b/db/post_migrate/20240627165253_drop_token_with_ivs_table.rb
@@ -3,8 +3,6 @@
 class DropTokenWithIvsTable < Gitlab::Database::Migration[2.2]
   milestone '17.5'
 
-  enable_lock_retries!
-
   TABLE_NAME = :token_with_ivs
 
   def up
diff --git a/db/post_migrate/20240709014310_cleanup_bigint_conversions_for_p_ci_builds_attempt2.rb b/db/post_migrate/20240709014310_cleanup_bigint_conversions_for_p_ci_builds_attempt2.rb
index c7207f36d55..d0858e55b1f 100644
--- a/db/post_migrate/20240709014310_cleanup_bigint_conversions_for_p_ci_builds_attempt2.rb
+++ b/db/post_migrate/20240709014310_cleanup_bigint_conversions_for_p_ci_builds_attempt2.rb
@@ -5,8 +5,6 @@ class CleanupBigintConversionsForPCiBuildsAttempt2 < Gitlab::Database::Migration
 
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE_NAME = :p_ci_builds
   TRIGGER_NAME = :trigger_10ee1357e825
   COLUMN_NAMES = %i[
diff --git a/db/post_migrate/20240715055251_cleanup_bigint_conversion_for_merge_requests_head_pipeline_id.rb b/db/post_migrate/20240715055251_cleanup_bigint_conversion_for_merge_requests_head_pipeline_id.rb
index f7dbc05b327..7b3094bc47d 100644
--- a/db/post_migrate/20240715055251_cleanup_bigint_conversion_for_merge_requests_head_pipeline_id.rb
+++ b/db/post_migrate/20240715055251_cleanup_bigint_conversion_for_merge_requests_head_pipeline_id.rb
@@ -3,8 +3,6 @@
 class CleanupBigintConversionForMergeRequestsHeadPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE = :merge_requests
   COLUMNS = [:head_pipeline_id]
 
diff --git a/db/post_migrate/20240715055311_cleanup_bigint_conversion_for_merge_request_metrics_pipeline_id.rb b/db/post_migrate/20240715055311_cleanup_bigint_conversion_for_merge_request_metrics_pipeline_id.rb
index 8efa369d2ea..2f373eeefac 100644
--- a/db/post_migrate/20240715055311_cleanup_bigint_conversion_for_merge_request_metrics_pipeline_id.rb
+++ b/db/post_migrate/20240715055311_cleanup_bigint_conversion_for_merge_request_metrics_pipeline_id.rb
@@ -3,8 +3,6 @@
 class CleanupBigintConversionForMergeRequestMetricsPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE = :merge_request_metrics
   COLUMNS = [:pipeline_id]
 
diff --git a/db/post_migrate/20240715055356_cleanup_bigint_conversion_for_merge_trains_pipeline_id.rb b/db/post_migrate/20240715055356_cleanup_bigint_conversion_for_merge_trains_pipeline_id.rb
index 76052e075d0..0646593c6b5 100644
--- a/db/post_migrate/20240715055356_cleanup_bigint_conversion_for_merge_trains_pipeline_id.rb
+++ b/db/post_migrate/20240715055356_cleanup_bigint_conversion_for_merge_trains_pipeline_id.rb
@@ -3,8 +3,6 @@
 class CleanupBigintConversionForMergeTrainsPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE = :merge_trains
   COLUMNS = [:pipeline_id]
 
diff --git a/db/post_migrate/20240715055415_cleanup_bigint_conversion_for_vulnerability_feedback_pipeline_id.rb b/db/post_migrate/20240715055415_cleanup_bigint_conversion_for_vulnerability_feedback_pipeline_id.rb
index 082dbed2273..43b29709d04 100644
--- a/db/post_migrate/20240715055415_cleanup_bigint_conversion_for_vulnerability_feedback_pipeline_id.rb
+++ b/db/post_migrate/20240715055415_cleanup_bigint_conversion_for_vulnerability_feedback_pipeline_id.rb
@@ -3,8 +3,6 @@
 class CleanupBigintConversionForVulnerabilityFeedbackPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE = :vulnerability_feedback
   COLUMNS = [:pipeline_id]
 
diff --git a/db/post_migrate/20240715055432_cleanup_bigint_conversion_for_vulnerability_occurrence_pipelines_pipeline_id.rb b/db/post_migrate/20240715055432_cleanup_bigint_conversion_for_vulnerability_occurrence_pipelines_pipeline_id.rb
index 7632af407bd..da116c32893 100644
--- a/db/post_migrate/20240715055432_cleanup_bigint_conversion_for_vulnerability_occurrence_pipelines_pipeline_id.rb
+++ b/db/post_migrate/20240715055432_cleanup_bigint_conversion_for_vulnerability_occurrence_pipelines_pipeline_id.rb
@@ -3,8 +3,6 @@
 class CleanupBigintConversionForVulnerabilityOccurrencePipelinesPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.3'
 
-  enable_lock_retries!
-
   TABLE = :vulnerability_occurrence_pipelines
   COLUMNS = [:pipeline_id]
 
diff --git a/db/post_migrate/20240719090903_track_plan_deletions.rb b/db/post_migrate/20240719090903_track_plan_deletions.rb
index f83156c75b6..91210ddc526 100644
--- a/db/post_migrate/20240719090903_track_plan_deletions.rb
+++ b/db/post_migrate/20240719090903_track_plan_deletions.rb
@@ -5,8 +5,6 @@ class TrackPlanDeletions < Gitlab::Database::Migration[2.2]
 
   milestone '17.4'
 
-  enable_lock_retries!
-
   def up
     track_record_deletions(:plans)
   end
diff --git a/db/post_migrate/20240807063339_remove_application_settings_required_instance_ci_template_column.rb b/db/post_migrate/20240807063339_remove_application_settings_required_instance_ci_template_column.rb
index eb02ed17156..2e272918ccb 100644
--- a/db/post_migrate/20240807063339_remove_application_settings_required_instance_ci_template_column.rb
+++ b/db/post_migrate/20240807063339_remove_application_settings_required_instance_ci_template_column.rb
@@ -2,7 +2,6 @@
 
 class RemoveApplicationSettingsRequiredInstanceCiTemplateColumn < Gitlab::Database::Migration[2.2]
   milestone '17.3'
-  enable_lock_retries!
 
   def up
     remove_column :application_settings, :required_instance_ci_template
diff --git a/db/post_migrate/20240814052751_cleanup_bigint_conversion_for_packages_build_infos_pipeline_id.rb b/db/post_migrate/20240814052751_cleanup_bigint_conversion_for_packages_build_infos_pipeline_id.rb
index 98a190220c9..eb62585793b 100644
--- a/db/post_migrate/20240814052751_cleanup_bigint_conversion_for_packages_build_infos_pipeline_id.rb
+++ b/db/post_migrate/20240814052751_cleanup_bigint_conversion_for_packages_build_infos_pipeline_id.rb
@@ -2,7 +2,6 @@
 
 class CleanupBigintConversionForPackagesBuildInfosPipelineId < Gitlab::Database::Migration[2.2]
   milestone '17.4'
-  enable_lock_retries!
 
   TABLE = :packages_build_infos
   COLUMNS = [:pipeline_id]
diff --git a/db/post_migrate/20240903062554_change_raw_usage_data_org_default.rb b/db/post_migrate/20240903062554_change_raw_usage_data_org_default.rb
index 79703936195..f089025fc01 100644
--- a/db/post_migrate/20240903062554_change_raw_usage_data_org_default.rb
+++ b/db/post_migrate/20240903062554_change_raw_usage_data_org_default.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class ChangeRawUsageDataOrgDefault < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
   milestone '17.4'
 
   def change
diff --git a/db/post_migrate/20240920131119_drop_p_ci_finished_build_ch_sync_event_project_id_default.rb b/db/post_migrate/20240920131119_drop_p_ci_finished_build_ch_sync_event_project_id_default.rb
index 8551480367f..493eaebd500 100644
--- a/db/post_migrate/20240920131119_drop_p_ci_finished_build_ch_sync_event_project_id_default.rb
+++ b/db/post_migrate/20240920131119_drop_p_ci_finished_build_ch_sync_event_project_id_default.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class DropPCiFinishedBuildChSyncEventProjectIdDefault < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '17.5'
 
   TABLE_NAME = :p_ci_finished_build_ch_sync_events
diff --git a/db/post_migrate/20250204181430_cleanup_bigint_conversion_for_geo_event_log_geo_event_id.rb b/db/post_migrate/20250204181430_cleanup_bigint_conversion_for_geo_event_log_geo_event_id.rb
index 2ce912c3cbd..885ec8babf9 100644
--- a/db/post_migrate/20250204181430_cleanup_bigint_conversion_for_geo_event_log_geo_event_id.rb
+++ b/db/post_migrate/20250204181430_cleanup_bigint_conversion_for_geo_event_log_geo_event_id.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class CleanupBigintConversionForGeoEventLogGeoEventId < Gitlab::Database::Migration[2.2]
-  enable_lock_retries!
-
   milestone '17.9'
 
   TABLE = :geo_event_log
diff --git a/db/post_migrate/20250311113123_ensure_id_uniqueness_for_p_ci_runners.rb b/db/post_migrate/20250311113123_ensure_id_uniqueness_for_p_ci_runners.rb
index 9306ca9b5a6..3f447463184 100644
--- a/db/post_migrate/20250311113123_ensure_id_uniqueness_for_p_ci_runners.rb
+++ b/db/post_migrate/20250311113123_ensure_id_uniqueness_for_p_ci_runners.rb
@@ -4,7 +4,6 @@ class EnsureIdUniquenessForPCiRunners < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::PartitioningMigrationHelpers::UniquenessHelpers
 
   milestone '17.10'
-  enable_lock_retries!
 
   TABLE_NAME = :ci_runners
   SEQ_NAME = :ci_runners_id_seq
diff --git a/db/post_migrate/20250311113127_ensure_id_uniqueness_for_p_ci_runner_machines.rb b/db/post_migrate/20250311113127_ensure_id_uniqueness_for_p_ci_runner_machines.rb
index 5266d294763..cd816e06b71 100644
--- a/db/post_migrate/20250311113127_ensure_id_uniqueness_for_p_ci_runner_machines.rb
+++ b/db/post_migrate/20250311113127_ensure_id_uniqueness_for_p_ci_runner_machines.rb
@@ -4,7 +4,6 @@ class EnsureIdUniquenessForPCiRunnerMachines < Gitlab::Database::Migration[2.2]
   include Gitlab::Database::PartitioningMigrationHelpers::UniquenessHelpers
 
   milestone '17.10'
-  enable_lock_retries!
 
   TABLE_NAME = :ci_runner_machines
   SEQ_NAME = :ci_runner_machines_id_seq
diff --git a/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb b/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb
new file mode 100644
index 00000000000..f53350d5305
--- /dev/null
+++ b/db/post_migrate/20250623010751_backfill_deployment_clusters_for_bigint_conversion.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class BackfillDeploymentClustersForBigintConversion < Gitlab::Database::Migration[2.3]
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  milestone '18.2'
+
+  TABLE = :deployment_clusters
+  COLUMNS = %i[deployment_id cluster_id]
+
+  def up
+    backfill_conversion_of_integer_to_bigint(TABLE, COLUMNS, primary_key: :deployment_id, sub_batch_size: 200)
+  end
+
+  def down
+    revert_backfill_conversion_of_integer_to_bigint(TABLE, COLUMNS, primary_key: :deployment_id)
+  end
+end
diff --git a/db/schema_migrations/20250623010727 b/db/schema_migrations/20250623010727
new file mode 100644
index 00000000000..fc674fa0b6f
--- /dev/null
+++ b/db/schema_migrations/20250623010727
@@ -0,0 +1 @@
+6e3814acb7f29c688c7f273f5ef4fe318dd0108c2c430fadbf95d72904c0a7b8
\ No newline at end of file
diff --git a/db/schema_migrations/20250623010751 b/db/schema_migrations/20250623010751
new file mode 100644
index 00000000000..15a7f19cd83
--- /dev/null
+++ b/db/schema_migrations/20250623010751
@@ -0,0 +1 @@
+dc96e028b1a2954a9709c14489b43061f092b55aba7dcfd1d468a4e96f077095
\ No newline at end of file
diff --git a/doc/topics/git/clone.md b/doc/topics/git/clone.md
index 5880d2ee6c9..adf7430ea4d 100644
--- a/doc/topics/git/clone.md
+++ b/doc/topics/git/clone.md
@@ -2,6 +2,7 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+description: Learn how to clone Git repositories from a GitLab server using different protocols (SSH or HTTPS) and various IDEs.
 title: Clone a Git repository to your local computer
 ---
 
diff --git a/doc/user/project/codeowners/troubleshooting.md b/doc/user/project/codeowners/troubleshooting.md
index 53162e9bd08..d408a5f9816 100644
--- a/doc/user/project/codeowners/troubleshooting.md
+++ b/doc/user/project/codeowners/troubleshooting.md
@@ -23,6 +23,7 @@ For more information about how the Code Owners feature handles errors, see [Erro
 
 - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/15598) in GitLab 17.11 [with a flag](../../../administration/feature_flags/_index.md) named `accessible_code_owners_validation`. Disabled by default.
 - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/524437) in GitLab 18.1.
+- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/549626) in GitLab 18.2. Feature flag `accessible_code_owners_validation` removed.
 
 {{< /history >}}
 
diff --git a/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb b/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb
index 9d016e4830e..9e01f45d228 100644
--- a/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb
@@ -38,7 +38,7 @@ RSpec.shared_examples 'issues move service' do |group|
     it_behaves_like 'updating timestamps'
 
     it 'delegates the close proceedings to Issues::CloseService' do
-      expect_any_instance_of(Issues::CloseService).to receive(:execute).with(issue).once
+      expect_any_instance_of(Issues::CloseService).to receive(:execute).with(issue).and_call_original
 
       described_class.new(parent, user, params).execute(issue)
     end