diff --git a/.rubocop_todo/rails/enum_syntax.yml b/.rubocop_todo/rails/enum_syntax.yml
deleted file mode 100644
index 700635c4e9d..00000000000
--- a/.rubocop_todo/rails/enum_syntax.yml
+++ /dev/null
@@ -1,110 +0,0 @@
----
-# Cop supports --autocorrect.
-Rails/EnumSyntax:
-  Exclude:
-    - 'app/models/abuse_report.rb'
-    - 'app/models/alert_management/alert.rb'
-    - 'app/models/alert_management/http_integration.rb'
-    - 'app/models/analytics/cycle_analytics/issue_stage_event.rb'
-    - 'app/models/analytics/cycle_analytics/merge_request_stage_event.rb'
-    - 'app/models/analytics/usage_trends/measurement.rb'
-    - 'app/models/anti_abuse/event.rb'
-    - 'app/models/anti_abuse/trust_score.rb'
-    - 'app/models/application_record.rb'
-    - 'app/models/authentication_event.rb'
-    - 'app/models/batched_git_ref_updates/deletion.rb'
-    - 'app/models/bulk_import.rb'
-    - 'app/models/bulk_imports/entity.rb'
-    - 'app/models/ci/build_metadata.rb'
-    - 'app/models/ci/build_pending_state.rb'
-    - 'app/models/ci/build_source.rb'
-    - 'app/models/ci/build_trace_chunk.rb'
-    - 'app/models/ci/catalog/resource.rb'
-    - 'app/models/ci/catalog/resources/component.rb'
-    - 'app/models/ci/catalog/resources/sync_event.rb'
-    - 'app/models/ci/catalog/verified_namespace.rb'
-    - 'app/models/ci/external_pull_request.rb'
-    - 'app/models/ci/job_artifact.rb'
-    - 'app/models/ci/job_token/project_scope_link.rb'
-    - 'app/models/ci/job_variable.rb'
-    - 'app/models/ci/pipeline.rb'
-    - 'app/models/ci/pipeline_artifact.rb'
-    - 'app/models/ci/pipeline_message.rb'
-    - 'app/models/ci/pipeline_metadata.rb'
-    - 'app/models/ci/resource_group.rb'
-    - 'app/models/ci/runner.rb'
-    - 'app/models/ci/runner_manager.rb'
-    - 'app/models/ci/runner_version.rb'
-    - 'app/models/ci/running_build.rb'
-    - 'app/models/ci/stage.rb'
-    - 'app/models/clusters/agent_token.rb'
-    - 'app/models/clusters/agents/activity_event.rb'
-    - 'app/models/clusters/cluster.rb'
-    - 'app/models/clusters/integrations/prometheus.rb'
-    - 'app/models/clusters/platforms/kubernetes.rb'
-    - 'app/models/commit_status.rb'
-    - 'app/models/concerns/analytics/cycle_analytics/stageable.rb'
-    - 'app/models/concerns/ci/artifactable.rb'
-    - 'app/models/concerns/ci/has_runner_executor.rb'
-    - 'app/models/concerns/ci/has_variable.rb'
-    - 'app/models/concerns/ci/lockable.rb'
-    - 'app/models/concerns/commit_signature.rb'
-    - 'app/models/concerns/has_user_type.rb'
-    - 'app/models/concerns/import/has_import_source.rb'
-    - 'app/models/concerns/issuable_link.rb'
-    - 'app/models/concerns/merge_request_reviewer_state.rb'
-    - 'app/models/concerns/packages/debian/component_file.rb'
-    - 'app/models/concerns/ttl_expirable.rb'
-    - 'app/models/container_registry/data_repair_detail.rb'
-    - 'app/models/container_registry/protection/rule.rb'
-    - 'app/models/container_repository.rb'
-    - 'app/models/customer_relations/contact.rb'
-    - 'app/models/customer_relations/organization.rb'
-    - 'app/models/deploy_token.rb'
-    - 'app/models/deployment.rb'
-    - 'app/models/design_management/action.rb'
-    - 'app/models/diff_note_position.rb'
-    - 'app/models/draft_note.rb'
-    - 'app/models/environment.rb'
-    - 'app/models/error_tracking/error.rb'
-    - 'app/models/event.rb'
-    - 'app/models/integrations/jira.rb'
-    - 'app/models/integrations/jira_tracker_data.rb'
-    - 'app/models/internal_id.rb'
-    - 'app/models/issuable_severity.rb'
-    - 'app/models/jira_import_state.rb'
-    - 'app/models/key.rb'
-    - 'app/models/list.rb'
-    - 'app/models/loose_foreign_keys/deleted_record.rb'
-    - 'app/models/merge_request_diff.rb'
-    - 'app/models/ml/candidate.rb'
-    - 'app/models/namespace/root_storage_statistics.rb'
-    - 'app/models/namespace_setting.rb'
-    - 'app/models/notification_setting.rb'
-    - 'app/models/operations/feature_flag.rb'
-    - 'app/models/organizations/organization_user.rb'
-    - 'app/models/packages/conan/file_metadatum.rb'
-    - 'app/models/packages/debian/file_metadatum.rb'
-    - 'app/models/packages/dependency_link.rb'
-    - 'app/models/packages/npm/metadata_cache.rb'
-    - 'app/models/packages/package.rb'
-    - 'app/models/packages/package_file.rb'
-    - 'app/models/packages/protection/rule.rb'
-    - 'app/models/packages/rpm/repository_file.rb'
-    - 'app/models/pages_domain.rb'
-    - 'app/models/project.rb'
-    - 'app/models/project_auto_devops.rb'
-    - 'app/models/project_ci_cd_setting.rb'
-    - 'app/models/project_repository.rb'
-    - 'app/models/projects/ci_feature_usage.rb'
-    - 'app/models/push_event_payload.rb'
-    - 'app/models/releases/link.rb'
-    - 'app/models/resource_events/abuse_report_event.rb'
-    - 'app/models/resource_events/issue_assignment_event.rb'
-    - 'app/models/resource_events/merge_request_assignment_event.rb'
-    - 'app/models/resource_label_event.rb'
-    - 'app/models/resource_milestone_event.rb'
-    - 'app/models/resource_state_event.rb'
-    - 'app/models/resource_timebox_event.rb'
-    - 'app/models/service_desk/custom_email_credential.rb'
-    - 'app/models/service_desk/custom_email_verification.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 6f22fcc3a5d..36f134e057b 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-124a10130bac885023b44616e773ffd4229ee592
+c46abdc81b87926a9cc99e13fdcbfb8ec516cb17
diff --git a/app/assets/javascripts/diffs/components/diffs_file_tree.vue b/app/assets/javascripts/diffs/components/diffs_file_tree.vue
index 9fef8d68460..16f9d8b7420 100644
--- a/app/assets/javascripts/diffs/components/diffs_file_tree.vue
+++ b/app/assets/javascripts/diffs/components/diffs_file_tree.vue
@@ -140,7 +140,7 @@ export default {
       :style="floatingWrapperStyles"
     >
       <panel-resizer
-        class="diff-tree-list-resizer"
+        class="diff-tree-list-resizer gl-hidden lg:gl-block"
         :start-size="treeWidth"
         :min-size="$options.minTreeWidth"
         :max-size="$options.maxTreeWidth"
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/app.vue b/app/assets/javascripts/projects/pipelines/charts/components/app.vue
index 97207935655..b70837bcf0a 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/app.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/app.vue
@@ -36,8 +36,7 @@ export default {
     },
   },
   data() {
-    const isClickHouseAvailable =
-      this.clickHouseEnabledForAnalytics && this.glFeatures?.ciImprovedProjectPipelineAnalytics;
+    const isClickHouseAvailable = this.clickHouseEnabledForAnalytics;
 
     const tabs = [
       {
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/clickhouse_help_popover.vue b/app/assets/javascripts/projects/pipelines/charts/components/clickhouse_help_popover.vue
index 4468ca75a8d..cc97b505271 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/clickhouse_help_popover.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/clickhouse_help_popover.vue
@@ -16,7 +16,7 @@ export default {
 };
 </script>
 <template>
-  <help-popover v-if="glFeatures.ciImprovedProjectPipelineAnalytics">
+  <help-popover>
     <template #title>
       {{ s__('PipelineCharts|Try ClickHouse for advanced analytics') }}
     </template>
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
index 49ac0352464..35afc7a9319 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue
@@ -55,7 +55,7 @@ export default {
   },
   searchInputDelay: 250,
   wildcardsHelpPath: helpPagePath('user/project/repository/branches/protected', {
-    anchor: 'protect-multiple-branches-with-wildcard-rules',
+    anchor: 'use-wildcard-rules',
   }),
   props: {
     projectPath: {
diff --git a/app/assets/javascripts/projects/settings/components/branch_rule_modal.vue b/app/assets/javascripts/projects/settings/components/branch_rule_modal.vue
index 9a983575de0..4f7617bdbe6 100644
--- a/app/assets/javascripts/projects/settings/components/branch_rule_modal.vue
+++ b/app/assets/javascripts/projects/settings/components/branch_rule_modal.vue
@@ -5,7 +5,7 @@ import { s__ } from '~/locale';
 import getProtectableBranches from '../graphql/queries/protectable_branches.query.graphql';
 
 const wildcardsHelpDocLink = helpPagePath('user/project/repository/branches/protected', {
-  anchor: 'protect-multiple-branches-with-wildcard-rules',
+  anchor: 'use-wildcard-rules',
 });
 export default {
   name: 'BranchRuleModal',
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 26b7518b054..5d11faeacf9 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -153,34 +153,18 @@ class GroupsController < Groups::ApplicationController
   def merge_requests; end
 
   def update
-    update_result = Groups::UpdateService.new(@group, current_user, group_params).execute
+    if Groups::UpdateService.new(@group, current_user, group_params).execute
 
-    respond_to do |format|
-      if update_result
-        format.html do
-          if @group.namespace_settings.errors.present?
-            flash[:alert] = @group.namespace_settings.errors.full_messages.to_sentence
-          else
-            flash[:notice] = "Group '#{@group.name}' was successfully updated."
-          end
-
-          redirect_to edit_group_origin_location
-        end
-
-        format.json do
-          head :no_content
-        end
+      if @group.namespace_settings.errors.present?
+        flash[:alert] = group.namespace_settings.errors.full_messages.to_sentence
       else
-        format.html do
-          @group.reset
-
-          render action: 'edit'
-        end
-
-        format.json do
-          render json: {}, status: :unprocessable_entity
-        end
+        flash[:notice] = "Group '#{@group.name}' was successfully updated."
       end
+
+      redirect_to edit_group_origin_location
+    else
+      @group.reset
+      render action: "edit"
     end
   end
 
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb
index c52deab3598..c577a5cd2bb 100644
--- a/app/controllers/projects/merge_requests/creations_controller.rb
+++ b/app/controllers/projects/merge_requests/creations_controller.rb
@@ -150,7 +150,8 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
   end
 
   def rapid_diffs?
-    ::Feature.enabled?(:rapid_diffs, current_user, type: :wip) &&
+    params[:rapid_diffs_disabled] != 'true' &&
+      ::Feature.enabled?(:rapid_diffs, current_user, type: :wip) &&
       ::Feature.enabled?(:rapid_diffs_on_mr_creation, current_user, type: :wip)
   end
 
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 6fcb95212c4..bb3de900c72 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -11,10 +11,6 @@ class Projects::PipelinesController < Projects::ApplicationController
     :charts, :destroy, :status, :manual_variables
   ]
 
-  before_action only: [:charts] do
-    push_frontend_feature_flag(:ci_improved_project_pipeline_analytics, project)
-  end
-
   before_action only: [:show] do
     push_frontend_feature_flag(:ci_pipeline_status_realtime, project)
   end
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 96c61ed9cc4..d1dfd346fc1 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -82,7 +82,7 @@ class AbuseReport < ApplicationRecord
   scope :with_users, -> { includes(:reporter, :user) }
   scope :with_labels, -> { includes(:labels) }
 
-  enum category: {
+  enum :category, {
     spam: 1,
     offensive: 2,
     phishing: 3,
@@ -93,7 +93,7 @@ class AbuseReport < ApplicationRecord
     other: 8
   }
 
-  enum status: {
+  enum :status, {
     open: 1,
     closed: 2
   }
diff --git a/app/models/alert_management/alert.rb b/app/models/alert_management/alert.rb
index 7ef7a8e15e4..27087076a95 100644
--- a/app/models/alert_management/alert.rb
+++ b/app/models/alert_management/alert.rb
@@ -60,7 +60,7 @@ module AlertManagement
     }, unless: :resolved?
     validate :hosts_format
 
-    enum severity: {
+    enum :severity, {
       critical: 0,
       high: 1,
       medium: 2,
@@ -69,7 +69,7 @@ module AlertManagement
       unknown: 5
     }
 
-    enum domain: {
+    enum :domain, {
       operations: 0,
       threat_monitoring: 1
     }
diff --git a/app/models/alert_management/http_integration.rb b/app/models/alert_management/http_integration.rb
index 3005793722c..0826a1a65cb 100644
--- a/app/models/alert_management/http_integration.rb
+++ b/app/models/alert_management/http_integration.rb
@@ -36,7 +36,7 @@ module AlertManagement
     scope :active, -> { where(active: true) }
     scope :ordered_by_type_and_id, -> { order(:type_identifier, :id) }
 
-    enum type_identifier: {
+    enum :type_identifier, {
       http: 0,
       prometheus: 1
     }
diff --git a/app/models/analytics/cycle_analytics/issue_stage_event.rb b/app/models/analytics/cycle_analytics/issue_stage_event.rb
index 7f8a365bfac..42f793886c5 100644
--- a/app/models/analytics/cycle_analytics/issue_stage_event.rb
+++ b/app/models/analytics/cycle_analytics/issue_stage_event.rb
@@ -9,7 +9,7 @@ module Analytics
       validates(*%i[stage_event_hash_id issue_id group_id project_id start_event_timestamp], presence: true)
 
       alias_attribute :state, :state_id
-      enum state: Issue.available_states, _suffix: true
+      enum :state, Issue.available_states, suffix: true
       belongs_to :issuable, class_name: 'Issue', foreign_key: 'issue_id', inverse_of: :issue_stage_events
 
       scope :assigned_to, ->(user) do
diff --git a/app/models/analytics/cycle_analytics/merge_request_stage_event.rb b/app/models/analytics/cycle_analytics/merge_request_stage_event.rb
index 51f3d47de2b..ade3afcffea 100644
--- a/app/models/analytics/cycle_analytics/merge_request_stage_event.rb
+++ b/app/models/analytics/cycle_analytics/merge_request_stage_event.rb
@@ -9,7 +9,7 @@ module Analytics
       validates(*%i[stage_event_hash_id merge_request_id group_id project_id start_event_timestamp], presence: true)
 
       alias_attribute :state, :state_id
-      enum state: MergeRequest.available_states, _suffix: true
+      enum :state, MergeRequest.available_states, suffix: true
 
       belongs_to :issuable, class_name: 'MergeRequest', foreign_key: 'merge_request_id', inverse_of: :merge_request_stage_events
 
diff --git a/app/models/analytics/usage_trends/measurement.rb b/app/models/analytics/usage_trends/measurement.rb
index 75440eaac66..98c14510c04 100644
--- a/app/models/analytics/usage_trends/measurement.rb
+++ b/app/models/analytics/usage_trends/measurement.rb
@@ -5,7 +5,7 @@ module Analytics
     class Measurement < ApplicationRecord
       self.table_name = 'analytics_usage_trends_measurements'
 
-      enum identifier: {
+      enum :identifier, {
         projects: 1,
         users: 2,
         issues: 3,
diff --git a/app/models/anti_abuse/event.rb b/app/models/anti_abuse/event.rb
index c895753c8f6..d9d4a887663 100644
--- a/app/models/anti_abuse/event.rb
+++ b/app/models/anti_abuse/event.rb
@@ -12,7 +12,7 @@ module AntiAbuse
     belongs_to :user, inverse_of: :abuse_events
     belongs_to :abuse_report, inverse_of: :abuse_events
 
-    enum category: Enums::Abuse::Category.categories
-    enum source: Enums::Abuse::Source.sources
+    enum :category, Enums::Abuse::Category.categories
+    enum :source, Enums::Abuse::Source.sources
   end
 end
diff --git a/app/models/anti_abuse/trust_score.rb b/app/models/anti_abuse/trust_score.rb
index cceacb8b8b9..b9f77901940 100644
--- a/app/models/anti_abuse/trust_score.rb
+++ b/app/models/anti_abuse/trust_score.rb
@@ -4,7 +4,7 @@ module AntiAbuse
   class TrustScore < ApplicationRecord
     self.table_name = 'abuse_trust_scores'
 
-    enum source: Enums::Abuse::Source.sources
+    enum :source, Enums::Abuse::Source.sources
 
     belongs_to :user
 
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 8de30d608b8..0feea9bccb5 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -113,7 +113,7 @@ class ApplicationRecord < ActiveRecord::Base
   end
 
   def self.declarative_enum(enum_mod)
-    enum(enum_mod.key => enum_mod.values)
+    enum enum_mod.key, enum_mod.values
   end
 
   def self.cached_column_list
diff --git a/app/models/authentication_event.rb b/app/models/authentication_event.rb
index 8d7cdabc231..d1600bac1ab 100644
--- a/app/models/authentication_event.rb
+++ b/app/models/authentication_event.rb
@@ -14,7 +14,7 @@ class AuthenticationEvent < ApplicationRecord
   validates :provider, :user_name, :result, presence: true
   validates :ip_address, ip_address: true
 
-  enum result: {
+  enum :result, {
     failed: 0,
     success: 1
   }
diff --git a/app/models/batched_git_ref_updates/deletion.rb b/app/models/batched_git_ref_updates/deletion.rb
index 9367cee5903..452b126395a 100644
--- a/app/models/batched_git_ref_updates/deletion.rb
+++ b/app/models/batched_git_ref_updates/deletion.rb
@@ -41,7 +41,7 @@ module BatchedGitRefUpdates
           .exists?
       end
 
-    enum status: { pending: 1, processed: 2 }, _prefix: :status
+    enum :status, { pending: 1, processed: 2 }, prefix: :status
 
     def self.mark_records_processed(records)
       update_by_partition(records) do |partitioned_scope|
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 5a334ffbc95..d1e89ce10c3 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -18,7 +18,7 @@ class BulkImport < ApplicationRecord
 
   validates :source_type, :status, presence: true
 
-  enum source_type: { gitlab: 0 }
+  enum :source_type, { gitlab: 0 }
 
   scope :stale, -> { where('updated_at < ?', 24.hours.ago).where(status: [0, 1]) }
   scope :order_by_updated_at_and_id, ->(direction) { order(updated_at: direction, id: :asc) }
diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb
index 5726932f5eb..f76db6a6155 100644
--- a/app/models/bulk_imports/entity.rb
+++ b/app/models/bulk_imports/entity.rb
@@ -54,7 +54,7 @@ class BulkImports::Entity < ApplicationRecord
   validate :validate_source_full_path_format
   validate :validate_bulk_import_organization_matches
 
-  enum source_type: { group_entity: 0, project_entity: 1 }
+  enum :source_type, { group_entity: 0, project_entity: 1 }
 
   scope :by_user_id, ->(user_id) { joins(:bulk_import).where(bulk_imports: { user_id: user_id }) }
   scope :stale, -> { where('updated_at < ?', 24.hours.ago).where(status: [0, 1]) }
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 6fb9b5652d6..2b15920d0f9 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -45,7 +45,7 @@ module Ci
     scope :with_interruptible, -> { where(interruptible: true) }
     scope :with_exposed_artifacts, -> { where(has_exposed_artifacts: true) }
 
-    enum timeout_source: {
+    enum :timeout_source, {
       unknown_timeout_source: 1,
       project_timeout_source: 2,
       runner_timeout_source: 3,
diff --git a/app/models/ci/build_pending_state.rb b/app/models/ci/build_pending_state.rb
index b0d64a6949b..eacbb724019 100644
--- a/app/models/ci/build_pending_state.rb
+++ b/app/models/ci/build_pending_state.rb
@@ -13,8 +13,8 @@ class Ci::BuildPendingState < Ci::ApplicationRecord
 
   partitionable scope: :build
 
-  enum state: Ci::Stage.statuses
-  enum failure_reason: CommitStatus.failure_reasons
+  enum :state, Ci::Stage.statuses
+  enum :failure_reason, CommitStatus.failure_reasons
 
   validates :build, presence: true
   validates :project_id, presence: true, on: :create
diff --git a/app/models/ci/build_source.rb b/app/models/ci/build_source.rb
index 4e0223c95a5..a6fdf9d7e52 100644
--- a/app/models/ci/build_source.rb
+++ b/app/models/ci/build_source.rb
@@ -10,7 +10,7 @@ module Ci
 
     ignore_column :pipeline_source, remove_with: '17.9', remove_after: '2025-01-15'
 
-    enum source: {
+    enum :source, {
       scan_execution_policy: 1001,
       pipeline_execution_policy: 1002
     }.merge(::Enums::Ci::Pipeline.sources)
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb
index 950bf31fc58..929cdbd7338 100644
--- a/app/models/ci/build_trace_chunk.rb
+++ b/app/models/ci/build_trace_chunk.rb
@@ -42,7 +42,7 @@ module Ci
     end.freeze
     LIVE_STORES = %i[redis redis_trace_chunks].freeze
 
-    enum data_store: DATA_STORES
+    enum :data_store, DATA_STORES
 
     scope :live, -> { where(data_store: LIVE_STORES) }
     scope :persisted, -> { where.not(data_store: LIVE_STORES).order(:chunk_index) }
diff --git a/app/models/ci/catalog/resource.rb b/app/models/ci/catalog/resource.rb
index 295694de494..0928554363d 100644
--- a/app/models/ci/catalog/resource.rb
+++ b/app/models/ci/catalog/resource.rb
@@ -25,7 +25,7 @@ module Ci
       has_many :component_last_usages, class_name: 'Ci::Catalog::Resources::Components::LastUsage',
         foreign_key: :catalog_resource_id, inverse_of: :catalog_resource
 
-      enum verification_level: VerifiedNamespace::VERIFICATION_LEVELS
+      enum :verification_level, VerifiedNamespace::VERIFICATION_LEVELS
 
       scope :for_projects, ->(project_ids) { where(project_id: project_ids) }
 
@@ -65,7 +65,7 @@ module Ci
 
       delegate :avatar_path, :star_count, :full_path, to: :project
 
-      enum state: { unpublished: 0, published: 1 }
+      enum :state, { unpublished: 0, published: 1 }
 
       before_create :sync_with_project
 
diff --git a/app/models/ci/catalog/resources/component.rb b/app/models/ci/catalog/resources/component.rb
index 3cd88881367..3eb3481707e 100644
--- a/app/models/ci/catalog/resources/component.rb
+++ b/app/models/ci/catalog/resources/component.rb
@@ -19,7 +19,7 @@ module Ci
         # an error about the save callback that is auto generated for this association.
         include BulkInsertSafe
 
-        enum component_type: { template: 1 }
+        enum :component_type, { template: 1 }
 
         validates :spec, json_schema: { filename: 'catalog_resource_component_spec' }
         validates :version, :catalog_resource, :project, :name, presence: true
diff --git a/app/models/ci/catalog/resources/sync_event.rb b/app/models/ci/catalog/resources/sync_event.rb
index 6366e20dbf7..ad19e26d6ae 100644
--- a/app/models/ci/catalog/resources/sync_event.rb
+++ b/app/models/ci/catalog/resources/sync_event.rb
@@ -28,7 +28,7 @@ module Ci
         scope :unprocessed_events, -> { select_with_partition.status_pending }
         scope :preload_synced_relation, -> { preload(catalog_resource: :project) }
 
-        enum status: { pending: 1, processed: 2 }, _prefix: :status
+        enum :status, { pending: 1, processed: 2 }, prefix: :status
 
         partitioned_by :partition_id, strategy: :sliding_list,
           next_partition_if: ->(active_partition) do
diff --git a/app/models/ci/catalog/verified_namespace.rb b/app/models/ci/catalog/verified_namespace.rb
index 182902dddc2..0095821a2f7 100644
--- a/app/models/ci/catalog/verified_namespace.rb
+++ b/app/models/ci/catalog/verified_namespace.rb
@@ -14,7 +14,7 @@ module Ci
 
       belongs_to :namespace
 
-      enum verification_level: VERIFICATION_LEVELS
+      enum :verification_level, VERIFICATION_LEVELS
 
       validates :namespace_id, presence: true, uniqueness: true
 
diff --git a/app/models/ci/external_pull_request.rb b/app/models/ci/external_pull_request.rb
index bd37aa9f85a..982f995bffd 100644
--- a/app/models/ci/external_pull_request.rb
+++ b/app/models/ci/external_pull_request.rb
@@ -30,7 +30,7 @@ module Ci
     validates :target_repository, presence: true
     validates :status, presence: true
 
-    enum status: {
+    enum :status, {
       open: 1,
       closed: 2
     }
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 89cb7e04895..d5a3c1d520f 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -24,7 +24,7 @@ module Ci
     partitionable scope: :job, partitioned: true
     query_constraints :id, :partition_id
 
-    enum accessibility: { public: 0, private: 1, none: 2 }, _suffix: true
+    enum :accessibility, { public: 0, private: 1, none: 2 }, suffix: true
 
     belongs_to :project
     belongs_to :job,
@@ -96,7 +96,7 @@ module Ci
     scope :created_in_time_range, ->(from: nil, to: nil) { where(created_at: from..to) }
 
     delegate :filename, :exists?, :open, to: :file
-    enum file_type: Enums::Ci::JobArtifact.file_type
+    enum :file_type, Enums::Ci::JobArtifact.file_type
 
     # `file_location` indicates where actual files are stored.
     # Ideally, actual files should be stored in the same directory, and use the same
@@ -107,7 +107,7 @@ module Ci
     #                 `ci_builds.artifacts_file` and `ci_builds.artifacts_metadata`
     # hashed_path ... The actual file is stored at a path consists of a SHA2 based on the project ID.
     #                 This is the default value.
-    enum file_location: Enums::Ci::JobArtifact.file_location
+    enum :file_location, Enums::Ci::JobArtifact.file_location
 
     def validate_file_format!
       unless Enums::Ci::JobArtifact.type_and_format_pairs[self.file_type&.to_sym] == self.file_format&.to_sym
diff --git a/app/models/ci/job_token/project_scope_link.rb b/app/models/ci/job_token/project_scope_link.rb
index 42bcdce9413..ba67e120d1a 100644
--- a/app/models/ci/job_token/project_scope_link.rb
+++ b/app/models/ci/job_token/project_scope_link.rb
@@ -32,7 +32,7 @@ module Ci
 
       # When outbound the target project is allowed to be accessed by the source job token.
       # When inbound the source project is allowed to be accessed by the target job token.
-      enum direction: {
+      enum :direction, {
         outbound: 0,
         inbound: 1
       }
diff --git a/app/models/ci/job_variable.rb b/app/models/ci/job_variable.rb
index 5171b493348..6033e4a0886 100644
--- a/app/models/ci/job_variable.rb
+++ b/app/models/ci/job_variable.rb
@@ -19,7 +19,7 @@ module Ci
     validates :key, uniqueness: { scope: :job_id }, unless: :dotenv_source?
     validates :project_id, presence: true, on: :create
 
-    enum source: { internal: 0, dotenv: 1 }, _suffix: true
+    enum :source, { internal: 0, dotenv: 1 }, suffix: true
 
     def set_project_id
       self.project_id ||= job&.project_id
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 4c80b063f71..df3d46baab8 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -197,15 +197,15 @@ module Ci
 
     # We use `Enums::Ci::Pipeline.sources` here so that EE can more easily extend
     # this `Hash` with new values.
-    enum source: Enums::Ci::Pipeline.sources
+    enum :source, Enums::Ci::Pipeline.sources
 
-    enum config_source: Enums::Ci::Pipeline.config_sources
+    enum :config_source, Enums::Ci::Pipeline.config_sources
 
     # We use `Enums::Ci::Pipeline.failure_reasons` here so that EE can more easily
     # extend this `Hash` with new values.
-    enum failure_reason: Enums::Ci::Pipeline.failure_reasons
+    enum :failure_reason, Enums::Ci::Pipeline.failure_reasons
 
-    enum locked: { unlocked: 0, artifacts_locked: 1 }
+    enum :locked, { unlocked: 0, artifacts_locked: 1 }
 
     state_machine :status, initial: :created do
       event :enqueue do
diff --git a/app/models/ci/pipeline_artifact.rb b/app/models/ci/pipeline_artifact.rb
index e0e6906f211..6a629ccc8af 100644
--- a/app/models/ci/pipeline_artifact.rb
+++ b/app/models/ci/pipeline_artifact.rb
@@ -38,7 +38,7 @@ module Ci
 
     update_project_statistics project_statistics_name: :pipeline_artifacts_size
 
-    enum file_type: {
+    enum :file_type, {
       code_coverage: 1,
       code_quality_mr_diff: 2
     }
diff --git a/app/models/ci/pipeline_message.rb b/app/models/ci/pipeline_message.rb
index 31dcb9f067d..21f05258040 100644
--- a/app/models/ci/pipeline_message.rb
+++ b/app/models/ci/pipeline_message.rb
@@ -15,7 +15,7 @@ module Ci
 
     before_save :truncate_long_content
 
-    enum severity: { error: 0, warning: 1 }
+    enum :severity, { error: 0, warning: 1 }
 
     private
 
diff --git a/app/models/ci/pipeline_metadata.rb b/app/models/ci/pipeline_metadata.rb
index 21d102374f0..11f7af6944d 100644
--- a/app/models/ci/pipeline_metadata.rb
+++ b/app/models/ci/pipeline_metadata.rb
@@ -7,16 +7,16 @@ module Ci
 
     self.primary_key = :pipeline_id
 
-    enum auto_cancel_on_new_commit: {
+    enum :auto_cancel_on_new_commit, {
       conservative: 0,
       interruptible: 1,
       none: 2
-    }, _prefix: true
+    }, prefix: true
 
-    enum auto_cancel_on_job_failure: {
+    enum :auto_cancel_on_job_failure, {
       none: 0,
       all: 1
-    }, _prefix: true
+    }, prefix: true
 
     belongs_to :pipeline, class_name: "Ci::Pipeline", inverse_of: :pipeline_metadata
     belongs_to :project, class_name: "Project", inverse_of: :pipeline_metadata
diff --git a/app/models/ci/resource_group.rb b/app/models/ci/resource_group.rb
index 78581ccb4e1..3ca2afd6513 100644
--- a/app/models/ci/resource_group.rb
+++ b/app/models/ci/resource_group.rb
@@ -14,7 +14,7 @@ module Ci
 
     before_create :ensure_resource
 
-    enum process_mode: {
+    enum :process_mode, {
       unordered: 0,
       oldest_first: 1,
       newest_first: 2,
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 06b8cb36188..95cb62e7a66 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -35,26 +35,26 @@ module Ci
         }
       }
 
-    enum access_level: {
+    enum :access_level, {
       not_protected: 0,
       ref_protected: 1
     }
 
-    enum runner_type: {
+    enum :runner_type, {
       instance_type: 1,
       group_type: 2,
       project_type: 3
     }
 
-    enum creation_state: {
+    enum :creation_state, {
       started: 0,
       finished: 100
-    }, _suffix: true
+    }, suffix: true
 
-    enum registration_type: {
+    enum :registration_type, {
       registration_token: 0,
       authenticated_user: 1
-    }, _suffix: true
+    }, suffix: true
 
     # Prefix assigned to runners created from the UI, instead of registered via the command line
     CREATED_RUNNER_TOKEN_PREFIX = 'glrt-'
diff --git a/app/models/ci/runner_manager.rb b/app/models/ci/runner_manager.rb
index 02d1dae73c9..cc043352416 100644
--- a/app/models/ci/runner_manager.rb
+++ b/app/models/ci/runner_manager.rb
@@ -39,12 +39,12 @@ module Ci
 
     belongs_to :runner, class_name: 'Ci::Runner', inverse_of: :runner_managers
 
-    enum creation_state: {
+    enum :creation_state, {
       started: 0,
       finished: 100
-    }, _suffix: true
+    }, suffix: true
 
-    enum runner_type: Runner.runner_types
+    enum :runner_type, Runner.runner_types
 
     has_many :runner_manager_builds, inverse_of: :runner_manager, foreign_key: :runner_machine_id,
       class_name: 'Ci::RunnerManagerBuild'
diff --git a/app/models/ci/runner_version.rb b/app/models/ci/runner_version.rb
index 03b50f13989..a90cecf49a2 100644
--- a/app/models/ci/runner_version.rb
+++ b/app/models/ci/runner_version.rb
@@ -4,7 +4,7 @@ module Ci
   class RunnerVersion < Ci::ApplicationRecord
     include EachBatch
 
-    enum status: {
+    enum :status, {
       not_processed: nil,
       invalid_version: -1,
       unavailable: 1,
diff --git a/app/models/ci/running_build.rb b/app/models/ci/running_build.rb
index aa4874127dc..69736472ff4 100644
--- a/app/models/ci/running_build.rb
+++ b/app/models/ci/running_build.rb
@@ -14,7 +14,7 @@ module Ci
       partition_foreign_key: :partition_id
     belongs_to :runner, class_name: 'Ci::Runner'
 
-    enum runner_type: ::Ci::Runner.runner_types
+    enum :runner_type, ::Ci::Runner.runner_types
 
     def self.upsert_build!(build)
       raise ArgumentError, 'build has not been picked by a runner' if build.runner.nil?
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index dae3b1e9ace..76e71f8b0bc 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -15,7 +15,7 @@ module Ci
     query_constraints :id, :partition_id
     partitionable scope: :pipeline, partitioned: true
 
-    enum status: Ci::HasStatus::STATUSES_ENUM
+    enum :status, Ci::HasStatus::STATUSES_ENUM
 
     belongs_to :project
     belongs_to :pipeline, ->(stage) { in_partition(stage) },
diff --git a/app/models/clusters/agent_token.rb b/app/models/clusters/agent_token.rb
index 951d0850594..537bb27fb46 100644
--- a/app/models/clusters/agent_token.rb
+++ b/app/models/clusters/agent_token.rb
@@ -29,7 +29,7 @@ module Clusters
     scope :active, -> { where(status: :active) }
     scope :connected, -> { active.where("last_used_at > ?", Clusters::Agent::INACTIVE_AFTER.ago) }
 
-    enum status: {
+    enum :status, {
       active: 0,
       revoked: 1
     }
diff --git a/app/models/clusters/agents/activity_event.rb b/app/models/clusters/agents/activity_event.rb
index 53731c55165..f268a0f3cee 100644
--- a/app/models/clusters/agents/activity_event.rb
+++ b/app/models/clusters/agents/activity_event.rb
@@ -19,21 +19,21 @@ module Clusters
 
       nullify_if_blank :detail
 
-      enum kind: {
+      enum :kind, {
         token_created: 0,
         token_revoked: 1,
         agent_connected: 2,
         agent_disconnected: 3
-      }, _prefix: true
+      }, prefix: true
 
-      enum level: {
+      enum :level, {
         debug: 0,
         info: 1,
         warn: 2,
         error: 3,
         fatal: 4,
         unknown: 5
-      }, _prefix: true
+      }, prefix: true
     end
   end
 end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index f5672a9ce65..ff52c97eb5d 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -73,17 +73,17 @@ module Clusters
     alias_attribute :base_domain, :domain
     alias_attribute :provided_by_user?, :user?
 
-    enum cluster_type: {
+    enum :cluster_type, {
       instance_type: 1,
       group_type: 2,
       project_type: 3
     }
 
-    enum platform_type: {
+    enum :platform_type, {
       kubernetes: 1
     }
 
-    enum provider_type: {
+    enum :provider_type, {
       user: 0,
       gcp: 1,
       aws: 2
diff --git a/app/models/clusters/integrations/prometheus.rb b/app/models/clusters/integrations/prometheus.rb
index 671de45c66d..6e47e9eab3e 100644
--- a/app/models/clusters/integrations/prometheus.rb
+++ b/app/models/clusters/integrations/prometheus.rb
@@ -16,7 +16,7 @@ module Clusters
       validates :enabled, inclusion: { in: [true, false] }
 
       # Periodically checked and kept up to date for Monitor demo projects
-      enum health_status: {
+      enum :health_status, {
         unknown: 0,
         healthy: 1,
         unhealthy: 2
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 8b8affd90b2..41b6b05ce6a 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -63,11 +63,11 @@ module Clusters
 
       alias_attribute :ca_pem, :ca_cert
 
-      enum authorization_type: {
+      enum :authorization_type, {
         unknown_authorization: nil,
         rbac: 1,
         abac: 2
-      }, _default: :rbac
+      }, default: :rbac
 
       nullify_if_blank :namespace
 
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 4332d964718..539048d6f88 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -37,10 +37,10 @@ class CommitStatus < Ci::ApplicationRecord
 
   attribute :retried, default: false
 
-  enum scheduling_type: { stage: 0, dag: 1 }, _prefix: true
+  enum :scheduling_type, { stage: 0, dag: 1 }, prefix: true
   # We use `Enums::Ci::CommitStatus.failure_reasons` here so that EE can more easily
   # extend this `Hash` with new values.
-  enum failure_reason: Enums::Ci::CommitStatus.failure_reasons
+  enum :failure_reason, Enums::Ci::CommitStatus.failure_reasons
 
   delegate :commit, to: :pipeline
   delegate :sha, :short_sha, :before_sha, to: :pipeline
diff --git a/app/models/concerns/analytics/cycle_analytics/stageable.rb b/app/models/concerns/analytics/cycle_analytics/stageable.rb
index aa0b7c3d846..88314343207 100644
--- a/app/models/concerns/analytics/cycle_analytics/stageable.rb
+++ b/app/models/concerns/analytics/cycle_analytics/stageable.rb
@@ -20,10 +20,10 @@ module Analytics
         validate :validate_stage_event_pairs
         validate :validate_labels
 
-        enum start_event_identifier: Gitlab::Analytics::CycleAnalytics::StageEvents.to_enum,
-          _prefix: :start_event_identifier
-        enum end_event_identifier: Gitlab::Analytics::CycleAnalytics::StageEvents.to_enum,
-          _prefix: :end_event_identifier
+        enum :start_event_identifier, Gitlab::Analytics::CycleAnalytics::StageEvents.to_enum,
+          prefix: :start_event_identifier
+        enum :end_event_identifier, Gitlab::Analytics::CycleAnalytics::StageEvents.to_enum,
+          prefix: :end_event_identifier
 
         alias_attribute :custom_stage?, :custom
         scope :default_stages, -> { where(custom: false) }
diff --git a/app/models/concerns/ci/artifactable.rb b/app/models/concerns/ci/artifactable.rb
index cafb0a36a26..41dae5d4822 100644
--- a/app/models/concerns/ci/artifactable.rb
+++ b/app/models/concerns/ci/artifactable.rb
@@ -28,11 +28,11 @@ module Ci
     JUNIT_MAX_BYTES = 100.megabytes
 
     included do
-      enum file_format: {
+      enum :file_format, {
         raw: 1,
         zip: 2,
         gzip: 3
-      }, _suffix: true
+      }, suffix: true
 
       scope :expired_before, ->(timestamp) { where(arel_table[:expire_at].lt(timestamp)) }
       scope :expired, -> { expired_before(Time.current) }
diff --git a/app/models/concerns/ci/has_runner_executor.rb b/app/models/concerns/ci/has_runner_executor.rb
index 6d4622945fe..187cf885c99 100644
--- a/app/models/concerns/ci/has_runner_executor.rb
+++ b/app/models/concerns/ci/has_runner_executor.rb
@@ -5,7 +5,7 @@ module Ci
     extend ActiveSupport::Concern
 
     included do
-      enum executor_type: {
+      enum :executor_type, {
         unknown: 0,
         custom: 1,
         shell: 2,
@@ -20,7 +20,7 @@ module Ci
         kubernetes: 11,
         docker_autoscaler: 12,
         instance: 13
-      }, _suffix: true
+      }, suffix: true
     end
   end
 end
diff --git a/app/models/concerns/ci/has_variable.rb b/app/models/concerns/ci/has_variable.rb
index db16e2a3874..ea191577cb9 100644
--- a/app/models/concerns/ci/has_variable.rb
+++ b/app/models/concerns/ci/has_variable.rb
@@ -7,7 +7,7 @@ module Ci
     included do
       include Gitlab::EncryptedAttribute
 
-      enum variable_type: {
+      enum :variable_type, {
         env_var: 1,
         file: 2
       }
diff --git a/app/models/concerns/ci/lockable.rb b/app/models/concerns/ci/lockable.rb
index 31ba93775e2..3c3e966b74c 100644
--- a/app/models/concerns/ci/lockable.rb
+++ b/app/models/concerns/ci/lockable.rb
@@ -10,11 +10,11 @@ module Ci
       # The values should be the same as `Ci::Pipeline.lockeds` with the
       # additional value of `unknown` to indicate rows that have not
       # yet been populated from the parent Ci::Pipeline
-      enum locked: {
+      enum :locked, {
         unlocked: 0,
         artifacts_locked: 1,
         unknown: 2
-      }, _prefix: :artifact
+      }, prefix: :artifact
     end
   end
 end
diff --git a/app/models/concerns/commit_signature.rb b/app/models/concerns/commit_signature.rb
index 31216b1fc9d..d65edfedbfc 100644
--- a/app/models/concerns/commit_signature.rb
+++ b/app/models/concerns/commit_signature.rb
@@ -9,7 +9,7 @@ module CommitSignature
 
     sha_attribute :commit_sha
 
-    enum verification_status: Enums::CommitSignature.verification_statuses
+    enum :verification_status, Enums::CommitSignature.verification_statuses
 
     belongs_to :project, class_name: 'Project', foreign_key: 'project_id', optional: false
 
diff --git a/app/models/concerns/has_user_type.rb b/app/models/concerns/has_user_type.rb
index 6011f3eff13..d77aa8821b0 100644
--- a/app/models/concerns/has_user_type.rb
+++ b/app/models/concerns/has_user_type.rb
@@ -47,7 +47,7 @@ module HasUserType
   INTERNAL_USER_TYPES = (USER_TYPES.keys - NON_INTERNAL_USER_TYPES).freeze
 
   included do
-    enum user_type: USER_TYPES
+    enum :user_type, USER_TYPES
 
     scope :bots, -> { where(user_type: BOT_USER_TYPES) }
     scope :without_bots, -> { where(user_type: USER_TYPES.keys - BOT_USER_TYPES) }
diff --git a/app/models/concerns/import/has_import_source.rb b/app/models/concerns/import/has_import_source.rb
index 28f8fc2d5f4..6510508801f 100644
--- a/app/models/concerns/import/has_import_source.rb
+++ b/app/models/concerns/import/has_import_source.rb
@@ -29,7 +29,7 @@ module Import
     }.freeze
 
     included do
-      enum imported_from: IMPORT_SOURCES, _prefix: :imported_from
+      enum :imported_from, IMPORT_SOURCES, prefix: :imported_from
     end
 
     def imported?
diff --git a/app/models/concerns/issuable_link.rb b/app/models/concerns/issuable_link.rb
index dcd2705185f..c6c58580c67 100644
--- a/app/models/concerns/issuable_link.rb
+++ b/app/models/concerns/issuable_link.rb
@@ -42,7 +42,7 @@ module IssuableLink
 
     scope :for_source_or_target, ->(issuable) { where(source: issuable).or(where(target: issuable)) }
 
-    enum link_type: Enums::IssuableLink.link_types
+    enum :link_type, Enums::IssuableLink.link_types
 
     private
 
diff --git a/app/models/concerns/merge_request_reviewer_state.rb b/app/models/concerns/merge_request_reviewer_state.rb
index 4d6e789609b..06e828fdeb1 100644
--- a/app/models/concerns/merge_request_reviewer_state.rb
+++ b/app/models/concerns/merge_request_reviewer_state.rb
@@ -4,7 +4,7 @@ module MergeRequestReviewerState
   extend ActiveSupport::Concern
 
   included do
-    enum state: {
+    enum :state, {
       unreviewed: 0,
       reviewed: 1,
       requested_changes: 2,
diff --git a/app/models/concerns/packages/debian/component_file.rb b/app/models/concerns/packages/debian/component_file.rb
index ece9219992e..73f7f2c8d0e 100644
--- a/app/models/concerns/packages/debian/component_file.rb
+++ b/app/models/concerns/packages/debian/component_file.rb
@@ -22,8 +22,8 @@ module Packages
 
         delegate container_type, to: :component
 
-        enum file_type: { packages: 1, sources: 2, di_packages: 3 }
-        enum compression_type: { gz: 1, bz2: 2, xz: 3 }
+        enum :file_type, { packages: 1, sources: 2, di_packages: 3 }
+        enum :compression_type, { gz: 1, bz2: 2, xz: 3 }
 
         validates :component, presence: true
         validates :file_type, presence: true
diff --git a/app/models/concerns/ttl_expirable.rb b/app/models/concerns/ttl_expirable.rb
index d09ce4873b1..618a8696619 100644
--- a/app/models/concerns/ttl_expirable.rb
+++ b/app/models/concerns/ttl_expirable.rb
@@ -7,7 +7,7 @@ module TtlExpirable
     attribute :read_at, default: -> { Time.zone.now }
     validates :status, presence: true
 
-    enum status: { default: 0, pending_destruction: 1, processing: 2, error: 3 }
+    enum :status, { default: 0, pending_destruction: 1, processing: 2, error: 3 }
 
     scope :read_before, ->(number_of_days) { where("read_at <= ?", Time.zone.now - number_of_days.days) }
     scope :active, -> { where(status: :default) }
diff --git a/app/models/concerns/use_sql_function_for_primary_key_lookups.rb b/app/models/concerns/use_sql_function_for_primary_key_lookups.rb
index 0c859f26aad..22421d247fb 100644
--- a/app/models/concerns/use_sql_function_for_primary_key_lookups.rb
+++ b/app/models/concerns/use_sql_function_for_primary_key_lookups.rb
@@ -12,14 +12,14 @@ module UseSqlFunctionForPrimaryKeyLookups
       super(replaced.arel, ...)
     end
 
-    def cached_find_by_statement(key, &_block)
+    def cached_find_by_statement(*args, **kwargs, &_block)
       transformed_block = proc do |params|
         original = yield(params)
 
         replaced = try_replace_with_function_call(original.arel)
         replaced || original
       end
-      super(key, &transformed_block)
+      super(*args, **kwargs, &transformed_block)
     end
 
     # Tries to replace an arel representation of a primary key lookup with an optimized function call.
diff --git a/app/models/container_registry/data_repair_detail.rb b/app/models/container_registry/data_repair_detail.rb
index a2616490905..5acaaeb8a3c 100644
--- a/app/models/container_registry/data_repair_detail.rb
+++ b/app/models/container_registry/data_repair_detail.rb
@@ -9,7 +9,7 @@ module ContainerRegistry
 
     belongs_to :project, optional: false
 
-    enum status: { ongoing: 0, completed: 1, failed: 2 }
+    enum :status, { ongoing: 0, completed: 1, failed: 2 }
 
     scope :ongoing_since, ->(threshold) { where(status: :ongoing).where('updated_at < ?', threshold) }
   end
diff --git a/app/models/container_registry/protection/rule.rb b/app/models/container_registry/protection/rule.rb
index 0a769689b79..f0049ab3f1e 100644
--- a/app/models/container_registry/protection/rule.rb
+++ b/app/models/container_registry/protection/rule.rb
@@ -3,12 +3,10 @@
 module ContainerRegistry
   module Protection
     class Rule < ApplicationRecord
-      enum minimum_access_level_for_delete:
-             Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
-        _prefix: :minimum_access_level_for_delete
-      enum minimum_access_level_for_push:
-             Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
-        _prefix: :minimum_access_level_for_push
+      enum :minimum_access_level_for_delete, Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
+        prefix: :minimum_access_level_for_delete
+      enum :minimum_access_level_for_push, Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
+        prefix: :minimum_access_level_for_push
 
       belongs_to :project, inverse_of: :container_registry_protection_rules
 
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 2e67285d8f4..3670f7ed57a 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -27,8 +27,8 @@ class ContainerRepository < ApplicationRecord
   validates :failed_deletion_count, presence: true
   validates :failed_deletion_count, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: MAX_DELETION_FAILURES }
 
-  enum status: { delete_scheduled: 0, delete_failed: 1, delete_ongoing: 2 }
-  enum expiration_policy_cleanup_status: { cleanup_unscheduled: 0, cleanup_scheduled: 1, cleanup_unfinished: 2, cleanup_ongoing: 3 }
+  enum :status, { delete_scheduled: 0, delete_failed: 1, delete_ongoing: 2 }
+  enum :expiration_policy_cleanup_status, { cleanup_unscheduled: 0, cleanup_scheduled: 1, cleanup_unfinished: 2, cleanup_ongoing: 3 }
 
   delegate :client, :gitlab_api_client, to: :registry
 
diff --git a/app/models/customer_relations/contact.rb b/app/models/customer_relations/contact.rb
index e0c7d9a619d..777cf97fe89 100644
--- a/app/models/customer_relations/contact.rb
+++ b/app/models/customer_relations/contact.rb
@@ -14,7 +14,7 @@ class CustomerRelations::Contact < ApplicationRecord
 
   strip_attributes! :phone, :first_name, :last_name
 
-  enum state: {
+  enum :state, {
     inactive: 0,
     active: 1
   }
diff --git a/app/models/customer_relations/organization.rb b/app/models/customer_relations/organization.rb
index 99fba66ec36..d19fd20932e 100644
--- a/app/models/customer_relations/organization.rb
+++ b/app/models/customer_relations/organization.rb
@@ -12,7 +12,7 @@ class CustomerRelations::Organization < ApplicationRecord
 
   strip_attributes! :name
 
-  enum state: {
+  enum :state, {
     inactive: 0,
     active: 1
   }
diff --git a/app/models/deploy_token.rb b/app/models/deploy_token.rb
index e76fdbbf99c..f1d47dd5275 100644
--- a/app/models/deploy_token.rb
+++ b/app/models/deploy_token.rb
@@ -40,7 +40,7 @@ class DeployToken < ApplicationRecord
 
   validates :expires_at, iso8601_date: true, on: :create
   validates :deploy_token_type, presence: true
-  enum deploy_token_type: {
+  enum :deploy_token_type, {
     group_type: 1,
     project_type: 2
   }
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index ae5f72529f0..0d8befed50a 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -151,7 +151,7 @@ class Deployment < ApplicationRecord
     end
   end
 
-  enum status: {
+  enum :status, {
     created: 0,
     running: 1,
     success: 2,
diff --git a/app/models/design_management/action.rb b/app/models/design_management/action.rb
index ea416868e45..3d055873633 100644
--- a/app/models/design_management/action.rb
+++ b/app/models/design_management/action.rb
@@ -13,7 +13,7 @@ module DesignManagement
     belongs_to :design, class_name: "DesignManagement::Design", inverse_of: :actions
     belongs_to :version, class_name: "DesignManagement::Version", inverse_of: :actions
 
-    enum event: { creation: 0, modification: 1, deletion: 2 }
+    enum :event, { creation: 0, modification: 1, deletion: 2 }
 
     # we assume sequential ordering.
     scope :ordered, -> { order(version_id: :asc) }
diff --git a/app/models/diff_note_position.rb b/app/models/diff_note_position.rb
index 5e9f0100e62..2d2f95eadbd 100644
--- a/app/models/diff_note_position.rb
+++ b/app/models/diff_note_position.rb
@@ -4,12 +4,12 @@ class DiffNotePosition < ApplicationRecord
   belongs_to :note
   attr_accessor :line_range
 
-  enum diff_content_type: {
+  enum :diff_content_type, {
     text: 0,
     image: 1
   }
 
-  enum diff_type: {
+  enum :diff_type, {
     head: 0
   }
 
diff --git a/app/models/draft_note.rb b/app/models/draft_note.rb
index 36052d72e53..9e7349fd2df 100644
--- a/app/models/draft_note.rb
+++ b/app/models/draft_note.rb
@@ -28,7 +28,7 @@ class DraftNote < ApplicationRecord
   validates :discussion_id, allow_nil: true, format: { with: /\A\h{40}\z/ }
   validates :line_code, length: { maximum: 255 }, allow_nil: true
 
-  enum note_type: {
+  enum :note_type, {
     Note: 0,
     DiffNote: 1,
     DiscussionNote: 2
diff --git a/app/models/environment.rb b/app/models/environment.rb
index a738f304aa7..71f421fb55d 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -194,7 +194,7 @@ class Environment < ApplicationRecord
     where(auto_delete_at: nil)
   end
 
-  enum tier: {
+  enum :tier, {
     production: 0,
     staging: 1,
     testing: 2,
@@ -202,10 +202,10 @@ class Environment < ApplicationRecord
     other: 4
   }
 
-  enum auto_stop_setting: {
+  enum :auto_stop_setting, {
     always: 0,
     with_action: 1
-  }, _prefix: true
+  }, prefix: true
 
   state_machine :state, initial: :available do
     event :start do
diff --git a/app/models/error_tracking/error.rb b/app/models/error_tracking/error.rb
index d9857eecab0..222f555a947 100644
--- a/app/models/error_tracking/error.rb
+++ b/app/models/error_tracking/error.rb
@@ -24,7 +24,7 @@ class ErrorTracking::Error < ApplicationRecord
   validates :platform, length: { maximum: 255 }
   validates :status, presence: true
 
-  enum status: {
+  enum :status, {
     unresolved: 0,
     resolved: 1,
     ignored: 2
diff --git a/app/models/event.rb b/app/models/event.rb
index 67e12978789..4c87febe00e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -53,7 +53,7 @@ class Event < ApplicationRecord
 
   sha_attribute :fingerprint
 
-  enum action: ACTIONS, _suffix: true
+  enum :action, ACTIONS, suffix: true
 
   delegate :name, :email, :public_email, :username, to: :author, prefix: true, allow_nil: true
   delegate :title, to: :issue, prefix: true, allow_nil: true
diff --git a/app/models/group_deploy_key.rb b/app/models/group_deploy_key.rb
index 14d70e91691..c65b00a6de0 100644
--- a/app/models/group_deploy_key.rb
+++ b/app/models/group_deploy_key.rb
@@ -12,16 +12,6 @@ class GroupDeployKey < Key
     joins(:group_deploy_keys_groups).where(group_deploy_keys_groups: { group_id: group_ids }).uniq
   end
 
-  # Remove usage_type because it defined in Key class but doesn't have a column in group_deploy_keys table
-  def self.defined_enums
-    super.without('usage_type')
-  end
-
-  # Remove Key#usage_type from attributes to avoid defining enum for it
-  def self.attributes_to_define_after_schema_loads
-    super.without('usage_type')
-  end
-
   def type
     'DeployKey'
   end
diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb
index 46b6726402f..54a43f5e3e8 100644
--- a/app/models/integrations/jira.rb
+++ b/app/models/integrations/jira.rb
@@ -66,7 +66,7 @@ module Integrations
     before_save :format_project_keys, if: :project_keys_changed?
     after_commit :update_deployment_type, on: [:create, :update], if: :update_deployment_type?
 
-    enum comment_detail: {
+    enum :comment_detail, {
       standard: 1,
       all_details: 2
     }
diff --git a/app/models/integrations/jira_tracker_data.rb b/app/models/integrations/jira_tracker_data.rb
index 74352393b43..0608959fe04 100644
--- a/app/models/integrations/jira_tracker_data.rb
+++ b/app/models/integrations/jira_tracker_data.rb
@@ -9,6 +9,6 @@ module Integrations
     attr_encrypted :username, encryption_options
     attr_encrypted :password, encryption_options
 
-    enum deployment_type: { unknown: 0, server: 1, cloud: 2 }, _prefix: :deployment
+    enum :deployment_type, { unknown: 0, server: 1, cloud: 2 }, prefix: :deployment
   end
 end
diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb
index 7ecc2aed4d9..88fa9d319ee 100644
--- a/app/models/internal_id.rb
+++ b/app/models/internal_id.rb
@@ -21,7 +21,7 @@ class InternalId < ApplicationRecord
   belongs_to :project
   belongs_to :namespace
 
-  enum usage: Enums::InternalId.usage_resources
+  enum :usage, Enums::InternalId.usage_resources
 
   validates :usage, presence: true
 
diff --git a/app/models/issuable_severity.rb b/app/models/issuable_severity.rb
index 08984bbb723..c2d11a599f1 100644
--- a/app/models/issuable_severity.rb
+++ b/app/models/issuable_severity.rb
@@ -23,7 +23,7 @@ class IssuableSeverity < ApplicationRecord
   validates :issue, presence: true, uniqueness: true
   validates :severity, presence: true
 
-  enum severity: {
+  enum :severity, {
     unknown: 0,
     low: 1,
     medium: 2,
diff --git a/app/models/jira_import_state.rb b/app/models/jira_import_state.rb
index 2d6486c4541..2c4f5155e42 100644
--- a/app/models/jira_import_state.rb
+++ b/app/models/jira_import_state.rb
@@ -84,7 +84,7 @@ class JiraImportState < ApplicationRecord
     end
   end
 
-  enum status: STATUSES
+  enum :status, STATUSES
 
   def in_progress?
     scheduled? || started?
diff --git a/app/models/key.rb b/app/models/key.rb
index 802554ec22a..96220959d0c 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -38,7 +38,8 @@ class Key < ApplicationRecord
 
   delegate :name, :email, to: :user, prefix: true
 
-  enum usage_type: {
+  attribute :usage_type, :integer, limit: 2
+  enum :usage_type, {
     auth_and_signing: 0,
     auth: 1,
     signing: 2
diff --git a/app/models/list.rb b/app/models/list.rb
index 65e4c20fd7a..365e77d855e 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -11,7 +11,7 @@ class List < ApplicationRecord
 
   has_many :list_user_preferences
 
-  enum list_type: { backlog: 0, label: 1, closed: 2, assignee: 3, milestone: 4, iteration: 5 }
+  enum :list_type, { backlog: 0, label: 1, closed: 2, assignee: 3, milestone: 4, iteration: 5 }
 
   validates :board, :list_type, presence: true, unless: :importing?
   validates :label_id, uniqueness: { scope: :board_id }, if: :label?
diff --git a/app/models/loose_foreign_keys/deleted_record.rb b/app/models/loose_foreign_keys/deleted_record.rb
index 5baa65cb5df..2a53a7a830e 100644
--- a/app/models/loose_foreign_keys/deleted_record.rb
+++ b/app/models/loose_foreign_keys/deleted_record.rb
@@ -36,7 +36,7 @@ class LooseForeignKeys::DeletedRecord < Gitlab::Database::SharedModel
   scope :for_partition, ->(partition) { where(partition: partition) }
   scope :consume_order, -> { order(:partition, :consume_after, :id) }
 
-  enum status: { pending: 1, processed: 2 }, _prefix: :status
+  enum :status, { pending: 1, processed: 2 }, prefix: :status
 
   def self.load_batch_for_table(table, batch_size)
     partition_names = Gitlab::Database::PostgresPartitionedTable.each_partition(table_name).map(&:name)
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 2bfac7e7606..ac0d365c728 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -71,7 +71,7 @@ class MergeRequestDiff < ApplicationRecord
     state :overflow_diff_lines_limit
   end
 
-  enum diff_type: {
+  enum :diff_type, {
     regular: 1,
     merge_head: 2
   }
diff --git a/app/models/ml/candidate.rb b/app/models/ml/candidate.rb
index c2d4dfe5a48..19d4531b950 100644
--- a/app/models/ml/candidate.rb
+++ b/app/models/ml/candidate.rb
@@ -6,7 +6,7 @@ module Ml
     include Presentable
     include AtomicInternalId
 
-    enum status: { running: 0, scheduled: 1, finished: 2, failed: 3, killed: 4 }
+    enum :status, { running: 0, scheduled: 1, finished: 2, failed: 3, killed: 4 }
 
     PACKAGE_PREFIX = 'candidate_'
 
diff --git a/app/models/namespace/root_storage_statistics.rb b/app/models/namespace/root_storage_statistics.rb
index 1d11bcb574c..d447fc19732 100644
--- a/app/models/namespace/root_storage_statistics.rb
+++ b/app/models/namespace/root_storage_statistics.rb
@@ -23,13 +23,13 @@ class Namespace::RootStorageStatistics < ApplicationRecord
 
   delegate :all_projects_except_soft_deleted, to: :namespace
 
-  enum notification_level: {
+  enum :notification_level, {
     storage_remaining: 100,
     caution: 30,
     warning: 15,
     danger: 5,
     exceeded: 0
-  }, _prefix: true
+  }, prefix: true
 
   def recalculate!
     update!(merged_attributes)
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index b74bcaf04a4..d1818cd8d33 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -10,7 +10,7 @@ class NamespaceSetting < ApplicationRecord
   columns_changing_default :require_dpop_for_manage_api_endpoints
 
   ignore_column :token_expiry_notify_inherited, remove_with: '17.9', remove_after: '2025-01-11'
-  enum pipeline_variables_default_role: ProjectCiCdSetting::PIPELINE_VARIABLES_OVERRIDE_ROLES, _prefix: true
+  enum :pipeline_variables_default_role, ProjectCiCdSetting::PIPELINE_VARIABLES_OVERRIDE_ROLES, prefix: true
 
   ignore_column :third_party_ai_features_enabled, remove_with: '16.11', remove_after: '2024-04-18'
   ignore_column :code_suggestions, remove_with: '17.8', remove_after: '2024-05-16'
@@ -21,9 +21,9 @@ class NamespaceSetting < ApplicationRecord
 
   belongs_to :namespace, inverse_of: :namespace_settings
 
-  enum jobs_to_be_done: { basics: 0, move_repository: 1, code_storage: 2, exploring: 3, ci: 4, other: 5 }, _suffix: true
-  enum enabled_git_access_protocol: { all: 0, ssh: 1, http: 2 }, _suffix: true
-  enum seat_control: { off: 0, user_cap: 1, block_overages: 2 }, _prefix: true
+  enum :jobs_to_be_done, { basics: 0, move_repository: 1, code_storage: 2, exploring: 3, ci: 4, other: 5 }, suffix: true
+  enum :enabled_git_access_protocol, { all: 0, ssh: 1, http: 2 }, suffix: true
+  enum :seat_control, { off: 0, user_cap: 1, block_overages: 2 }, prefix: true
 
   attribute :default_branch_protection_defaults, default: -> { {} }
 
diff --git a/app/models/namespaces/project_namespace.rb b/app/models/namespaces/project_namespace.rb
index aa0dc904870..d886625c37f 100644
--- a/app/models/namespaces/project_namespace.rb
+++ b/app/models/namespaces/project_namespace.rb
@@ -19,7 +19,7 @@ module Namespaces
     #
     # TODO: we can remove these attribute aliases when we no longer need to sync these with project model,
     # see ProjectNamespace#sync_attributes_from_project
-    alias_attribute :namespace, :parent
+    alias_method :namespace, :parent
     alias_attribute :namespace_id, :parent_id
     has_one :project, inverse_of: :project_namespace
 
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 58d09892658..50db31ac159 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -4,7 +4,7 @@ class NotificationSetting < ApplicationRecord
   include EachBatch
   include FromUnion
 
-  enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 }, _default: :global
+  enum :level, { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 }, default: :global
 
   belongs_to :user
   belongs_to :source, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb
index defb27e12c0..def440c94ab 100644
--- a/app/models/operations/feature_flag.rb
+++ b/app/models/operations/feature_flag.rb
@@ -46,7 +46,7 @@ module Operations
 
     scope :new_version_only, -> { where(version: :new_version_flag) }
 
-    enum version: {
+    enum :version, {
       new_version_flag: 2
     }
 
diff --git a/app/models/organizations/organization_user.rb b/app/models/organizations/organization_user.rb
index 9e3942ff6ba..d503c267c46 100644
--- a/app/models/organizations/organization_user.rb
+++ b/app/models/organizations/organization_user.rb
@@ -14,7 +14,7 @@ module Organizations
 
     before_destroy :ensure_user_has_an_organization
 
-    enum access_level: {
+    enum :access_level, {
       # Until we develop more access_levels, we really don't know if the default access_level will be what we think of
       # as a guest. For now, we'll set to same value as guest, but call it default to denote the current ambivalence.
       default: Gitlab::Access::GUEST,
diff --git a/app/models/packages/conan/file_metadatum.rb b/app/models/packages/conan/file_metadatum.rb
index 31a0d026c60..b72d9a30eaa 100644
--- a/app/models/packages/conan/file_metadatum.rb
+++ b/app/models/packages/conan/file_metadatum.rb
@@ -15,7 +15,7 @@ class Packages::Conan::FileMetadatum < ApplicationRecord
   validate :conan_package_type
   validate :ensure_recipe_revision_with_package_revision
 
-  enum conan_file_type: { recipe_file: 1, package_file: 2 }
+  enum :conan_file_type, { recipe_file: 1, package_file: 2 }
 
   RECIPE_FILES = ::Gitlab::Regex::Packages::CONAN_RECIPE_FILES
   PACKAGE_FILES = ::Gitlab::Regex::Packages::CONAN_PACKAGE_FILES
diff --git a/app/models/packages/debian/file_metadatum.rb b/app/models/packages/debian/file_metadatum.rb
index ca6dd899a72..05a91142f56 100644
--- a/app/models/packages/debian/file_metadatum.rb
+++ b/app/models/packages/debian/file_metadatum.rb
@@ -12,7 +12,7 @@ module Packages
       validates :package_file, presence: true
       validate :valid_debian_package_type
 
-      enum file_type: {
+      enum :file_type, {
         unknown: 1, source: 2, dsc: 3, deb: 4, udeb: 5, buildinfo: 6, changes: 7, ddeb: 8
       }
 
diff --git a/app/models/packages/dependency_link.rb b/app/models/packages/dependency_link.rb
index 400b4cce208..6fbc06eab70 100644
--- a/app/models/packages/dependency_link.rb
+++ b/app/models/packages/dependency_link.rb
@@ -11,7 +11,7 @@ class Packages::DependencyLink < ApplicationRecord
   validates :dependency_type,
     uniqueness: { scope: %i[package_id dependency_id] }
 
-  enum dependency_type: { dependencies: 1, devDependencies: 2, bundleDependencies: 3, peerDependencies: 4 }
+  enum :dependency_type, { dependencies: 1, devDependencies: 2, bundleDependencies: 3, peerDependencies: 4 }
 
   scope :with_dependency_type, ->(dependency_type) { where(dependency_type: dependency_type) }
   scope :includes_dependency, -> { includes(:dependency) }
diff --git a/app/models/packages/npm/metadata_cache.rb b/app/models/packages/npm/metadata_cache.rb
index 59327196cce..07528d8b657 100644
--- a/app/models/packages/npm/metadata_cache.rb
+++ b/app/models/packages/npm/metadata_cache.rb
@@ -7,7 +7,7 @@ module Packages
       include Packages::Downloadable
       include Packages::Destructible
 
-      enum status: { default: 0, processing: 1, pending_destruction: 2, error: 3 }
+      enum :status, { default: 0, processing: 1, pending_destruction: 2, error: 3 }
 
       belongs_to :project, inverse_of: :npm_metadata_caches
 
diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb
index 1b5086e4e2a..b6e96f349ce 100644
--- a/app/models/packages/package.rb
+++ b/app/models/packages/package.rb
@@ -14,7 +14,7 @@ class Packages::Package < ApplicationRecord
   DETAILED_INFO_STATUSES = [:default, :deprecated].freeze
   STATUS_MESSAGE_MAX_LENGTH = 255
 
-  enum package_type: {
+  enum :package_type, {
     maven: 1,
     npm: 2,
     conan: 3,
@@ -31,7 +31,7 @@ class Packages::Package < ApplicationRecord
     ml_model: 14
   }
 
-  enum status: { default: 0, hidden: 1, processing: 2, error: 3, pending_destruction: 4, deprecated: 5 }
+  enum :status, { default: 0, hidden: 1, processing: 2, error: 3, pending_destruction: 4, deprecated: 5 }
 
   belongs_to :project
   belongs_to :creator, class_name: 'User'
diff --git a/app/models/packages/package_file.rb b/app/models/packages/package_file.rb
index 0ba4986df07..435721187d3 100644
--- a/app/models/packages/package_file.rb
+++ b/app/models/packages/package_file.rb
@@ -16,7 +16,7 @@ class Packages::PackageFile < ApplicationRecord
   delegate :file_type, :dsc?, :component, :architecture, :fields, to: :debian_file_metadatum, prefix: :debian
   delegate :channel, :metadata, to: :helm_file_metadatum, prefix: :helm
 
-  enum status: { default: 0, pending_destruction: 1, processing: 2, error: 3 }
+  enum :status, { default: 0, pending_destruction: 1, processing: 2, error: 3 }
 
   belongs_to :package
 
diff --git a/app/models/packages/protection/rule.rb b/app/models/packages/protection/rule.rb
index 84e8d7aeba1..a3b4864c77d 100644
--- a/app/models/packages/protection/rule.rb
+++ b/app/models/packages/protection/rule.rb
@@ -3,13 +3,11 @@
 module Packages
   module Protection
     class Rule < ApplicationRecord
-      enum package_type: Packages::Package.package_types.slice(:conan, :maven, :npm, :nuget, :pypi)
-      enum minimum_access_level_for_delete:
-          Gitlab::Access.sym_options_with_admin.slice(:owner, :admin),
-        _prefix: :minimum_access_level_for_delete
-      enum minimum_access_level_for_push:
-          Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
-        _prefix: :minimum_access_level_for_push
+      enum :package_type, Packages::Package.package_types.slice(:conan, :maven, :npm, :nuget, :pypi)
+      enum :minimum_access_level_for_delete, Gitlab::Access.sym_options_with_admin.slice(:owner, :admin),
+        prefix: :minimum_access_level_for_delete
+      enum :minimum_access_level_for_push, Gitlab::Access.sym_options_with_admin.slice(:maintainer, :owner, :admin),
+        prefix: :minimum_access_level_for_push
 
       belongs_to :project, inverse_of: :package_protection_rules
 
diff --git a/app/models/packages/rpm/repository_file.rb b/app/models/packages/rpm/repository_file.rb
index f6ded66cf41..5a8036e1f46 100644
--- a/app/models/packages/rpm/repository_file.rb
+++ b/app/models/packages/rpm/repository_file.rb
@@ -11,7 +11,7 @@ module Packages
       FILELISTS_FILENAME = 'filelists.xml'
       FILELISTS_SIZE_LIMITATION = 20.megabytes
 
-      enum status: { default: 0, pending_destruction: 1, processing: 2, error: 3 }
+      enum :status, { default: 0, pending_destruction: 1, processing: 2, error: 3 }
 
       belongs_to :project, inverse_of: :rpm_repository_files
 
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index f4d4e5d3b7c..16eb07b0c51 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -14,9 +14,9 @@ class PagesDomain < ApplicationRecord
 
   X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN = 19
 
-  enum certificate_source: { user_provided: 0, gitlab_provided: 1 }, _prefix: :certificate
-  enum scope: { instance: 0, group: 1, project: 2 }, _prefix: :scope, _default: :project
-  enum usage: { pages: 0, serverless: 1 }, _prefix: :usage, _default: :pages
+  enum :certificate_source, { user_provided: 0, gitlab_provided: 1 }, prefix: :certificate
+  enum :scope, { instance: 0, group: 1, project: 2 }, prefix: :scope, default: :project
+  enum :usage, { pages: 0, serverless: 1 }, prefix: :usage, default: :pages
 
   belongs_to :project
   has_many :acme_orders, class_name: "PagesDomainAcmeOrder"
diff --git a/app/models/project.rb b/app/models/project.rb
index 2ec36e7da2e..d917dd2f2de 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -937,7 +937,7 @@ class Project < ApplicationRecord
     left_outer_joins(:fork_network_member).where(fork_network_member: { forked_from_project_id: nil })
   }
 
-  enum auto_cancel_pending_pipelines: { disabled: 0, enabled: 1 }
+  enum :auto_cancel_pending_pipelines, { disabled: 0, enabled: 1 }
 
   chronic_duration_attr :build_timeout_human_readable, :build_timeout,
     default: 3600, error_message: N_('Maximum job timeout has a value which could not be accepted')
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index 7894d4b3465..f5c70416740 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -3,7 +3,7 @@
 class ProjectAutoDevops < ApplicationRecord
   belongs_to :project, inverse_of: :auto_devops
 
-  enum deploy_strategy: {
+  enum :deploy_strategy, {
     continuous: 0,
     manual: 1,
     timed_incremental: 2
diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb
index 10c3e9658d0..e369865b13f 100644
--- a/app/models/project_ci_cd_setting.rb
+++ b/app/models/project_ci_cd_setting.rb
@@ -20,7 +20,7 @@ class ProjectCiCdSetting < ApplicationRecord
 
   ALLOWED_SUB_CLAIM_COMPONENTS = %w[project_path ref_type ref].freeze
 
-  enum pipeline_variables_minimum_override_role: PIPELINE_VARIABLES_OVERRIDE_ROLES, _prefix: true
+  enum :pipeline_variables_minimum_override_role, PIPELINE_VARIABLES_OVERRIDE_ROLES, prefix: true
 
   before_validation :set_pipeline_variables_secure_defaults, on: :create
   before_create :set_default_git_depth
diff --git a/app/models/project_repository.rb b/app/models/project_repository.rb
index 4119a00b84b..c11ceb039b8 100644
--- a/app/models/project_repository.rb
+++ b/app/models/project_repository.rb
@@ -4,7 +4,7 @@ class ProjectRepository < ApplicationRecord
   include EachBatch
   include Shardable
 
-  enum object_format: { sha1: 0, sha256: 1 }
+  enum :object_format, { sha1: 0, sha256: 1 }
 
   validates :object_format, presence: true
 
diff --git a/app/models/projects/ci_feature_usage.rb b/app/models/projects/ci_feature_usage.rb
index a10426e50c9..215a64967c3 100644
--- a/app/models/projects/ci_feature_usage.rb
+++ b/app/models/projects/ci_feature_usage.rb
@@ -8,7 +8,7 @@ module Projects
 
     validates :project, :feature, presence: true
 
-    enum feature: {
+    enum :feature, {
       code_coverage: 1,
       security_report: 2
     }
diff --git a/app/models/push_event_payload.rb b/app/models/push_event_payload.rb
index 8358be35470..31ad08903fb 100644
--- a/app/models/push_event_payload.rb
+++ b/app/models/push_event_payload.rb
@@ -13,13 +13,13 @@ class PushEventPayload < ApplicationRecord
   sha_attribute :commit_from
   sha_attribute :commit_to
 
-  enum action: {
+  enum :action, {
     created: 0,
     removed: 1,
     pushed: 2
   }
 
-  enum ref_type: {
+  enum :ref_type, {
     branch: 0,
     tag: 1
   }
diff --git a/app/models/releases/link.rb b/app/models/releases/link.rb
index 85d55e0652d..9d971645d9d 100644
--- a/app/models/releases/link.rb
+++ b/app/models/releases/link.rb
@@ -27,7 +27,7 @@ module Releases
 
     scope :sorted, -> { order(created_at: :desc) }
 
-    enum link_type: {
+    enum :link_type, {
       other: 0,
       runbook: 1,
       package: 2,
diff --git a/app/models/resource_events/abuse_report_event.rb b/app/models/resource_events/abuse_report_event.rb
index 5881f87241d..62b0b581490 100644
--- a/app/models/resource_events/abuse_report_event.rb
+++ b/app/models/resource_events/abuse_report_event.rb
@@ -9,7 +9,7 @@ module ResourceEvents
 
     validates :action, presence: true
 
-    enum action: {
+    enum :action, {
       ban_user: 1,
       block_user: 2,
       delete_user: 3,
@@ -21,7 +21,7 @@ module ResourceEvents
       trust_user_and_close_report: 9
     }
 
-    enum reason: {
+    enum :reason, {
       spam: 1,
       offensive: 2,
       phishing: 3,
diff --git a/app/models/resource_events/issue_assignment_event.rb b/app/models/resource_events/issue_assignment_event.rb
index 393e2aa8942..3c0116618aa 100644
--- a/app/models/resource_events/issue_assignment_event.rb
+++ b/app/models/resource_events/issue_assignment_event.rb
@@ -9,7 +9,7 @@ module ResourceEvents
 
     validates :issue, presence: true
 
-    enum action: { add: 1, remove: 2 }
+    enum :action, { add: 1, remove: 2 }
 
     def self.issuable_id_column
       :issue_id
diff --git a/app/models/resource_events/merge_request_assignment_event.rb b/app/models/resource_events/merge_request_assignment_event.rb
index 778b9101858..972415d3fd8 100644
--- a/app/models/resource_events/merge_request_assignment_event.rb
+++ b/app/models/resource_events/merge_request_assignment_event.rb
@@ -9,7 +9,7 @@ module ResourceEvents
 
     validates :merge_request, presence: true
 
-    enum action: { add: 1, remove: 2 }
+    enum :action, { add: 1, remove: 2 }
 
     def self.issuable_id_column
       :merge_request_id
diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb
index 8ab54efd91e..508b1a46e6d 100644
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -17,7 +17,7 @@ class ResourceLabelEvent < ResourceEvent
 
   after_commit :broadcast_notes_changed, unless: :importing?
 
-  enum action: {
+  enum :action, {
     add: 1,
     remove: 2
   }
diff --git a/app/models/resource_milestone_event.rb b/app/models/resource_milestone_event.rb
index 1d00261926d..0ffaf924b6c 100644
--- a/app/models/resource_milestone_event.rb
+++ b/app/models/resource_milestone_event.rb
@@ -21,7 +21,7 @@ class ResourceMilestoneEvent < ResourceTimeboxEvent
   scope :include_relations, -> { includes(:user, milestone: [:project, :group]) }
 
   # state is used for issue and merge request states.
-  enum state: Issue.available_states.merge(MergeRequest.available_states)
+  enum :state, Issue.available_states.merge(MergeRequest.available_states)
 
   def milestone_title
     milestone&.title
diff --git a/app/models/resource_state_event.rb b/app/models/resource_state_event.rb
index 3b54a0cc431..11b907d192d 100644
--- a/app/models/resource_state_event.rb
+++ b/app/models/resource_state_event.rb
@@ -11,7 +11,7 @@ class ResourceStateEvent < ResourceEvent
   belongs_to :source_merge_request, class_name: 'MergeRequest', foreign_key: :source_merge_request_id
 
   # state is used for issue and merge request states.
-  enum state: Issue.available_states.merge(MergeRequest.available_states).merge(reopened: 5)
+  enum :state, Issue.available_states.merge(MergeRequest.available_states).merge(reopened: 5)
 
   after_create :issue_usage_metrics
 
diff --git a/app/models/resource_timebox_event.rb b/app/models/resource_timebox_event.rb
index 644ffae5749..7a021b6bb87 100644
--- a/app/models/resource_timebox_event.rb
+++ b/app/models/resource_timebox_event.rb
@@ -8,7 +8,7 @@ class ResourceTimeboxEvent < ResourceEvent
 
   validate :exactly_one_issuable, unless: :importing?
 
-  enum action: {
+  enum :action, {
     add: 1,
     remove: 2
   }
diff --git a/app/models/service_desk/custom_email_credential.rb b/app/models/service_desk/custom_email_credential.rb
index 2cf037b873e..c037d48902c 100644
--- a/app/models/service_desk/custom_email_credential.rb
+++ b/app/models/service_desk/custom_email_credential.rb
@@ -6,7 +6,7 @@ module ServiceDesk
 
     # Used to explicitly set the SMTP AUTH method.
     # If nil Net::SMTP will choose one of methods listed by the SMTP server.
-    enum smtp_authentication: {
+    enum :smtp_authentication, {
       plain: 0,
       login: 1,
       cram_md5: 2
diff --git a/app/models/service_desk/custom_email_verification.rb b/app/models/service_desk/custom_email_verification.rb
index 62ab63d7339..488aab03294 100644
--- a/app/models/service_desk/custom_email_verification.rb
+++ b/app/models/service_desk/custom_email_verification.rb
@@ -7,7 +7,7 @@ module ServiceDesk
     TIMEFRAME = 30.minutes
     STATES = { started: 0, finished: 1, failed: 2 }.freeze
 
-    enum error: {
+    enum :error, {
       incorrect_token: 0,
       incorrect_from: 1,
       mail_not_received_within_timeframe: 2,
@@ -94,7 +94,7 @@ module ServiceDesk
 
     # Needs to be below `state_machine` definition to suppress
     # its method override warnings
-    enum state: STATES
+    enum :state, STATES
 
     class << self
       def generate_token
diff --git a/app/models/user.rb b/app/models/user.rb
index 47eb7cea315..759c369f4f0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -212,7 +212,6 @@ class User < ApplicationRecord
     -> { where(members: { access_level: [Gitlab::Access::MAINTAINER, Gitlab::Access::OWNER] }) },
     through: :group_members,
     source: :group
-  alias_attribute :masters_groups, :maintainers_groups
   has_many :developer_maintainer_owned_groups,
     -> { where(members: { access_level: [Gitlab::Access::DEVELOPER, Gitlab::Access::MAINTAINER, Gitlab::Access::OWNER] }) },
     through: :group_members,
diff --git a/app/views/protected_branches/shared/_create_protected_branch.html.haml b/app/views/protected_branches/shared/_create_protected_branch.html.haml
index 79b5c6831e5..ccceafd540f 100644
--- a/app/views/protected_branches/shared/_create_protected_branch.html.haml
+++ b/app/views/protected_branches/shared/_create_protected_branch.html.haml
@@ -13,7 +13,7 @@
       - else
         = render partial: "protected_branches/shared/dropdown", locals: { f: f, toggle_classes: '!gl-w-full gl-form-input-lg' }
       .form-text.gl-text-subtle
-        - wildcards_url = help_page_url('user/project/repository/branches/protected.md', anchor: 'protect-multiple-branches-with-wildcard-rules')
+        - wildcards_url = help_page_url('user/project/repository/branches/protected.md', anchor: 'use-wildcard-rules')
         - wildcards_link_tag_pair = tag_pair(link_to('', wildcards_url, target: '_blank', rel: 'noopener noreferrer'), :wildcards_link_start, :wildcards_link_end)
 
         - case_sensitive_url = help_page_url('user/project/repository/branches/protected.md', anchor: 'branch-names-are-case-sensitive')
diff --git a/app/views/protected_branches/shared/_index.html.haml b/app/views/protected_branches/shared/_index.html.haml
index 63bf5b63354..30d457bbdb9 100644
--- a/app/views/protected_branches/shared/_index.html.haml
+++ b/app/views/protected_branches/shared/_index.html.haml
@@ -25,7 +25,7 @@
       toggle_options: { data: { testid: 'add-protected-branch-button' } }) do |c|
       - c.with_description do
         = s_("ProtectedBranch|By default, protected branches restrict who can modify the branch.")
-        = link_to s_("ProtectedBranch|Learn more."), help_page_path("user/project/repository/branches/protected.md", anchor: "who-can-modify-a-protected-branch")
+        = link_to s_("ProtectedBranch|Learn more."), help_page_path("user/project/repository/branches/protection_rules.md", anchor: "push-and-merge-permissions")
       - c.with_body do
         = content_for :branches_list
 
diff --git a/config/application.rb b/config/application.rb
index 16e51a0377e..62179fd7dde 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -306,6 +306,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/commit_description.css"
     config.assets.precompile << "page_bundles/commit_rapid_diffs.css"
     config.assets.precompile << "page_bundles/commits.css"
+    config.assets.precompile << "page_bundles/compare_rapid_diffs.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/dashboard.css"
     config.assets.precompile << "page_bundles/dashboard_projects.css"
@@ -337,6 +338,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/merge_request_analytics.css"
     config.assets.precompile << "page_bundles/merge_request_rapid_diffs.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
+    config.assets.precompile << "page_bundles/merge_request_creation_rapid_diffs.css"
     config.assets.precompile << "page_bundles/milestone.css"
     config.assets.precompile << "page_bundles/ml_experiment_tracking.css"
     config.assets.precompile << "page_bundles/new_namespace.css"
diff --git a/config/feature_flags/wip/collect_product_usage_events.yml b/config/feature_flags/beta/collect_product_usage_events.yml
similarity index 70%
rename from config/feature_flags/wip/collect_product_usage_events.yml
rename to config/feature_flags/beta/collect_product_usage_events.yml
index 2aef56e479d..25ccf96b6e5 100644
--- a/config/feature_flags/wip/collect_product_usage_events.yml
+++ b/config/feature_flags/beta/collect_product_usage_events.yml
@@ -2,8 +2,8 @@
 name: collect_product_usage_events
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/510317
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182916
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/540574
 milestone: '17.10'
 group: group::analytics instrumentation
-type: wip
-default_enabled: false
+type: beta
+default_enabled: true
diff --git a/config/feature_flags/gitlab_com_derisk/disable_widget_responses.yml b/config/feature_flags/beta/disable_widget_responses.yml
similarity index 86%
rename from config/feature_flags/gitlab_com_derisk/disable_widget_responses.yml
rename to config/feature_flags/beta/disable_widget_responses.yml
index 7292300c201..4b2d7bc5353 100644
--- a/config/feature_flags/gitlab_com_derisk/disable_widget_responses.yml
+++ b/config/feature_flags/beta/disable_widget_responses.yml
@@ -5,5 +5,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182725
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521327
 milestone: '17.10'
 group: group::source code
-type: gitlab_com_derisk
-default_enabled: false
+type: beta
+default_enabled: true
diff --git a/config/feature_flags/wip/ci_improved_project_pipeline_analytics.yml b/config/feature_flags/wip/ci_improved_project_pipeline_analytics.yml
deleted file mode 100644
index 9ba14bdb6c2..00000000000
--- a/config/feature_flags/wip/ci_improved_project_pipeline_analytics.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: ci_improved_project_pipeline_analytics
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444468
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167848
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/497254
-milestone: '17.5'
-group: group::runner
-type: wip
-default_enabled: false
diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb
index 73df2b41a04..cf309fbc7b1 100644
--- a/config/initializers/active_record_lifecycle.rb
+++ b/config/initializers/active_record_lifecycle.rb
@@ -20,7 +20,7 @@ if defined?(ActiveRecord::Base)
 
     # the following is highly recommended for Rails + "preload_app true"
     # as there's no need for the master process to hold a connection
-    ActiveRecord::Base.clear_all_connections! # rubocop:disable Database/MultipleDatabases
+    ActiveRecord::Base.connection_handler.clear_all_connections!
 
     Gitlab::AppLogger.debug("ActiveRecord connections disconnected")
   end
diff --git a/config/initializers/postgresql_cte.rb b/config/initializers/postgresql_cte.rb
index 40d959c1ba0..7cce4294f0f 100644
--- a/config/initializers/postgresql_cte.rb
+++ b/config/initializers/postgresql_cte.rb
@@ -99,7 +99,7 @@ module ActiveRecord
       end
     end
 
-    def build_arel(aliases = nil)
+    def build_arel(*)
       arel = super
 
       build_with(arel) if @values[:with_values]
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index fb576b559ea..09c4ee3702e 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -76,7 +76,7 @@ Sidekiq.configure_server do |config|
   config.on :startup do
     # Clear any connections that might have been obtained before starting
     # Sidekiq (e.g. in an initializer).
-    ActiveRecord::Base.clear_all_connections! # rubocop:disable Database/MultipleDatabases
+    ActiveRecord::Base.connection_handler.clear_all_connections!
 
     # Start monitor to track running jobs. By default, cancel job is not enabled
     # To cancel job, it requires `SIDEKIQ_MONITOR_WORKER=1` to enable notification channel
diff --git a/db/docs/deleted_tables/taggings.yml b/db/docs/deleted_tables/taggings.yml
new file mode 100644
index 00000000000..e9cd64beca1
--- /dev/null
+++ b/db/docs/deleted_tables/taggings.yml
@@ -0,0 +1,8 @@
+---
+table_name: taggings
+feature_categories:
+- continuous_integration
+- runner
+gitlab_schema: gitlab_ci
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/178462
+removed_in_milestone: '18.0'
diff --git a/db/docs/taggings.yml b/db/docs/taggings.yml
deleted file mode 100644
index 16ca65258d7..00000000000
--- a/db/docs/taggings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-table_name: taggings
-classes: []
-feature_categories:
-- continuous_integration
-- runner
-description: Taggings applied to arbitrary models based on entries in the 'tags' table
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/b946da44695c9c8fe8867bb87bcdf801c52177d3
-milestone: '1.2'
-gitlab_schema: gitlab_ci
-sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467202
-table_size: over_limit
diff --git a/db/migrate/20250428232147_change_unique_contraints_ci_job_artifact_states.rb b/db/migrate/20250428232147_change_unique_contraints_ci_job_artifact_states.rb
new file mode 100644
index 00000000000..88f0e289c37
--- /dev/null
+++ b/db/migrate/20250428232147_change_unique_contraints_ci_job_artifact_states.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class ChangeUniqueContraintsCiJobArtifactStates < Gitlab::Database::Migration[2.3]
+  milestone '18.0'
+
+  disable_ddl_transaction!
+
+  TABLE_NAME = :ci_job_artifact_states
+  PK_NAME = :ci_job_artifact_states_pkey
+  OLD_INDEX_NAME = :index_ci_job_artifact_states_on_job_artifact_id_partition_id
+  NEW_INDEX_NAME = :unique_ci_job_artifact_states_on_job_artifact_id_partition_id
+
+  def up
+    # Create a new concurrent unique index
+    add_concurrent_index(TABLE_NAME, [:job_artifact_id, :partition_id], unique: true, name: NEW_INDEX_NAME)
+
+    # Remove the existing non-unique index if it exists
+    remove_concurrent_index_by_name(TABLE_NAME, OLD_INDEX_NAME)
+
+    # Now add the primary key using this unique index
+    swap_primary_key(TABLE_NAME, PK_NAME, NEW_INDEX_NAME)
+  end
+
+  def down
+    temp_index_name = :temp_ci_job_artifact_states_job_artifact_id_idx
+    add_concurrent_index(TABLE_NAME, :job_artifact_id, unique: true, name: temp_index_name)
+
+    # Swap the primary key to use this temporary index
+    swap_primary_key(TABLE_NAME, PK_NAME, temp_index_name)
+
+    # Create the original non-unique index for idempotency
+    add_concurrent_index(TABLE_NAME, [:job_artifact_id, :partition_id], unique: false, name: OLD_INDEX_NAME)
+
+    # Remove the composite unique index
+    remove_concurrent_index_by_name(TABLE_NAME, NEW_INDEX_NAME)
+  end
+end
diff --git a/db/post_migrate/20250505150842_drop_taggings.rb b/db/post_migrate/20250505150842_drop_taggings.rb
new file mode 100644
index 00000000000..ade838f0481
--- /dev/null
+++ b/db/post_migrate/20250505150842_drop_taggings.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class DropTaggings < Gitlab::Database::Migration[2.3]
+  milestone '18.0'
+  skip_require_disable_ddl_transactions!
+
+  def up
+    drop_table :taggings
+  end
+
+  def down
+    create_table :taggings do |t|
+      t.bigint :tag_id
+      t.string :taggable_type
+      t.bigint :tagger_id
+      t.string :tagger_type
+      t.string :context
+      t.timestamp :created_at # rubocop: disable Migration/Datetime -- rollback must match the type
+      t.bigint :taggable_id
+
+      t.index :tag_id, name: 'index_taggings_on_tag_id'
+      t.index [:taggable_id, :taggable_type, :context],
+        name: 'index_taggings_on_taggable_id_and_taggable_type_and_context'
+      t.index [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+        unique: true,
+        name: 'taggings_idx'
+    end
+  end
+end
diff --git a/db/schema_migrations/20250428232147 b/db/schema_migrations/20250428232147
new file mode 100644
index 00000000000..4143a90f30a
--- /dev/null
+++ b/db/schema_migrations/20250428232147
@@ -0,0 +1 @@
+991f3dd3fb082c82f9ce1f212bb68faf2bafbf589300d117be06fd7fca313ae0
\ No newline at end of file
diff --git a/db/schema_migrations/20250505150842 b/db/schema_migrations/20250505150842
new file mode 100644
index 00000000000..9b81802a6e9
--- /dev/null
+++ b/db/schema_migrations/20250505150842
@@ -0,0 +1 @@
+5af6027238f4de5472a13d95d97dde856dda7821a7f2be6e28f3c0bee8a2e9d5
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 406d42531ac..a18225fccf0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -23503,26 +23503,6 @@ CREATE SEQUENCE system_note_metadata_id_seq
 
 ALTER SEQUENCE system_note_metadata_id_seq OWNED BY system_note_metadata.id;
 
-CREATE TABLE taggings (
-    tag_id bigint,
-    taggable_type character varying,
-    tagger_id bigint,
-    tagger_type character varying,
-    context character varying,
-    created_at timestamp without time zone,
-    id bigint NOT NULL,
-    taggable_id bigint
-);
-
-CREATE SEQUENCE taggings_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE taggings_id_seq OWNED BY taggings.id;
-
 CREATE TABLE tags (
     id bigint NOT NULL,
     name character varying,
@@ -27835,8 +27815,6 @@ ALTER TABLE ONLY system_access_microsoft_graph_access_tokens ALTER COLUMN id SET
 
 ALTER TABLE ONLY system_note_metadata ALTER COLUMN id SET DEFAULT nextval('system_note_metadata_id_seq'::regclass);
 
-ALTER TABLE ONLY taggings ALTER COLUMN id SET DEFAULT nextval('taggings_id_seq'::regclass);
-
 ALTER TABLE ONLY tags ALTER COLUMN id SET DEFAULT nextval('tags_id_seq'::regclass);
 
 ALTER TABLE ONLY target_branch_rules ALTER COLUMN id SET DEFAULT nextval('target_branch_rules_id_seq'::regclass);
@@ -29109,7 +29087,7 @@ ALTER TABLE ONLY ci_instance_variables
     ADD CONSTRAINT ci_instance_variables_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY ci_job_artifact_states
-    ADD CONSTRAINT ci_job_artifact_states_pkey PRIMARY KEY (job_artifact_id);
+    ADD CONSTRAINT ci_job_artifact_states_pkey PRIMARY KEY (job_artifact_id, partition_id);
 
 ALTER TABLE ONLY p_ci_job_artifacts
     ADD CONSTRAINT p_ci_job_artifacts_pkey PRIMARY KEY (id, partition_id);
@@ -30902,9 +30880,6 @@ ALTER TABLE ONLY system_access_microsoft_graph_access_tokens
 ALTER TABLE ONLY system_note_metadata
     ADD CONSTRAINT system_note_metadata_pkey PRIMARY KEY (id);
 
-ALTER TABLE ONLY taggings
-    ADD CONSTRAINT taggings_pkey PRIMARY KEY (id);
-
 ALTER TABLE ONLY tags
     ADD CONSTRAINT tags_pkey PRIMARY KEY (id);
 
@@ -34187,8 +34162,6 @@ CREATE INDEX index_ci_instance_runner_monthly_usages_on_project_and_month ON ci_
 
 CREATE UNIQUE INDEX index_ci_instance_variables_on_key ON ci_instance_variables USING btree (key);
 
-CREATE INDEX index_ci_job_artifact_states_on_job_artifact_id_partition_id ON ci_job_artifact_states USING btree (job_artifact_id, partition_id);
-
 CREATE INDEX p_ci_job_artifacts_expire_at_idx ON ONLY p_ci_job_artifacts USING btree (expire_at) WHERE ((locked = 0) AND (file_type <> 3) AND (expire_at IS NOT NULL));
 
 CREATE INDEX index_ci_job_artifacts_expire_at_unlocked_non_trace ON ci_job_artifacts USING btree (expire_at) WHERE ((locked = 0) AND (file_type <> 3) AND (expire_at IS NOT NULL));
@@ -37387,10 +37360,6 @@ CREATE UNIQUE INDEX index_system_note_metadata_on_description_version_id ON syst
 
 CREATE UNIQUE INDEX index_system_note_metadata_on_note_id ON system_note_metadata USING btree (note_id);
 
-CREATE INDEX index_taggings_on_tag_id ON taggings USING btree (tag_id);
-
-CREATE INDEX index_taggings_on_taggable_id_and_taggable_type_and_context ON taggings USING btree (taggable_id, taggable_type, context);
-
 CREATE UNIQUE INDEX index_tags_on_name ON tags USING btree (name);
 
 CREATE INDEX index_tags_on_name_trigram ON tags USING gin (name gin_trgm_ops);
@@ -38417,8 +38386,6 @@ CREATE UNIQUE INDEX snippet_user_mentions_on_snippet_id_and_note_id_index ON sni
 
 CREATE UNIQUE INDEX snippet_user_mentions_on_snippet_id_index ON snippet_user_mentions USING btree (snippet_id) WHERE (note_id IS NULL);
 
-CREATE UNIQUE INDEX taggings_idx ON taggings USING btree (tag_id, taggable_id, taggable_type, context, tagger_id, tagger_type);
-
 CREATE INDEX temp_index_on_users_where_dark_theme ON users USING btree (id) WHERE (theme_id = 11);
 
 CREATE UNIQUE INDEX term_agreements_unique_index ON term_agreements USING btree (user_id, term_id);
diff --git a/doc/administration/analytics.md b/doc/administration/analytics.md
index 88aa216fedc..d8e57b9e905 100644
--- a/doc/administration/analytics.md
+++ b/doc/administration/analytics.md
@@ -20,7 +20,7 @@ title: Use ClickHouse for analytics reports
 
 {{< /history >}}
 
-The [contribution analytics](../user/group/contribution_analytics/_index.md) report and [Value Streams Dashboard](../user/analytics/value_streams_dashboard.md#dashboard-metrics-and-drill-down-reports) contributors count metric can use ClickHouse as a data source.
+The [contribution analytics](../user/group/contribution_analytics/_index.md) report, [CI/CD analytics dashboard](../user/analytics/ci_cd_analytics.md), and [Value Streams Dashboard](../user/analytics/value_streams_dashboard.md#dashboard-metrics-and-drill-down-reports) contributors count metric can use ClickHouse as a data source.
 
 Prerequisites:
 
diff --git a/doc/administration/logs/_index.md b/doc/administration/logs/_index.md
index 2d0740fa3ad..6da149e3a40 100644
--- a/doc/administration/logs/_index.md
+++ b/doc/administration/logs/_index.md
@@ -65,18 +65,19 @@ GITLAB_LOG_LEVEL=info
 For some services, other log levels are in place that are not affected by this setting.
 Some of these services have their own environment variables to override the log level. For example:
 
-| Service              | Log level | Environment variable |
-|:---------------------|:----------|:---------------------|
-| GitLab Cleanup       | `INFO`    | `DEBUG`              |
-| GitLab Doctor        | `INFO`    | `VERBOSE`            |
-| GitLab Export        | `INFO`    | `EXPORT_DEBUG`       |
-| GitLab Import        | `INFO`    | `IMPORT_DEBUG`       |
-| GitLab QA Runtime    | `INFO`    | `QA_LOG_LEVEL`       |
-| Google APIs          | `INFO`    |                      |
-| Rack Timeout         | `ERROR`   |                      |
-| Snowplow Tracker     | `FATAL`   |                      |
-| gRPC Client (Gitaly) | `WARN`    | `GRPC_LOG_LEVEL`     |
-| LLM                  | `INFO`    | `LLM_DEBUG`          |
+| Service                   | Log level | Environment variable |
+|:--------------------------|:----------|:---------------------|
+| GitLab Cleanup            | `INFO`    | `DEBUG`              |
+| GitLab Doctor             | `INFO`    | `VERBOSE`            |
+| GitLab Export             | `INFO`    | `EXPORT_DEBUG`       |
+| GitLab Import             | `INFO`    | `IMPORT_DEBUG`       |
+| GitLab QA Runtime         | `INFO`    | `QA_LOG_LEVEL`       |
+| GitLab Product Usage Data | `INFO`    |                      |
+| Google APIs               | `INFO`    |                      |
+| Rack Timeout              | `ERROR`   |                      |
+| Snowplow Tracker          | `FATAL`   |                      |
+| gRPC Client (Gitaly)      | `WARN`    | `GRPC_LOG_LEVEL`     |
+| LLM                       | `INFO`    | `LLM_DEBUG`          |
 
 ## Log Rotation
 
@@ -1228,6 +1229,46 @@ For example:
 }
 ```
 
+## Product Usage Data log
+
+Note: We recommend against using the raw logs for analysing feature usage, as the data quality has not yet been certified for accuracy. Certified in-product adoption reports will be available once the data is ready for analysis.
+This file is located at:
+
+- `/var/log/gitlab/gitlab-rails/product_usage_data.log` on Linux package installations.
+- `/home/git/gitlab/log/product_usage_data.log` on self-compiled installations.
+
+It contains JSON-formatted logs of product usage events tracked through Snowplow. Each line in the file contains a separate JSON entry that can be ingested by services like Elasticsearch or Splunk. Line breaks were added to examples for legibility:
+
+```json
+{
+  "severity":"INFO",
+  "time":"2025-04-09T13:43:40.254Z",
+  "message":"sending event",
+  "payload":"{
+  \"e\":\"se\",
+  \"se_ca\":\"projects:merge_requests:diffs\",
+  \"se_ac\":\"i_code_review_user_searches_diff\",
+  \"cx\":\"eyJzY2hlbWEiOiJpZ2x1OmNvbS5zbm93cGxvd2FuYWx5dGljcy5zbm93cGxvdy9jb250ZXh0cy9qc29uc2NoZW1hLzEtMC0xIiwiZGF0YSI6W3sic2NoZW1hIjoiaWdsdTpjb20uZ2l0bGFiL2dpdGxhYl9zdGFuZGFyZC9qc29uc2NoZW1hLzEtMS0xIiwiZGF0YSI6eyJlbnZpcm9ubWVudCI6ImRldmVsb3BtZW50Iiwic291cmNlIjoiZ2l0bGFiLXJhaWxzIiwiY29ycmVsYXRpb25faWQiOiJlNDk2NzNjNWI2MGQ5ODc0M2U4YWI0MjZiMTZmMTkxMiIsInBsYW4iOiJkZWZhdWx0IiwiZXh0cmEiOnt9LCJ1c2VyX2lkIjpudWxsLCJnbG9iYWxfdXNlcl9pZCI6bnVsbCwiaXNfZ2l0bGFiX3RlYW1fbWVtYmVyIjpudWxsLCJuYW1lc3BhY2VfaWQiOjMxLCJwcm9qZWN0X2lkIjo2LCJmZWF0dXJlX2VuYWJsZWRfYnlfbmFtZXNwYWNlX2lkcyI6bnVsbCwicmVhbG0iOiJzZWxmLW1hbmFnZWQiLCJpbnN0YW5jZV9pZCI6IjJkMDg1NzBkLWNmZGItNDFmMy1iODllLWM3MTM5YmFjZTI3NSIsImhvc3RfbmFtZSI6ImpsYXJzZW4tLTIwMjIxMjE0LVBWWTY5IiwiaW5zdGFuY2VfdmVyc2lvbiI6IjE3LjExLjAiLCJjb250ZXh0X2dlbmVyYXRlZF9hdCI6IjIwMjUtMDQtMDkgMTM6NDM6NDAgVVRDIn19LHsic2NoZW1hIjoiaWdsdTpjb20uZ2l0bGFiL2dpdGxhYl9zZXJ2aWNlX3BpbmcvanNvbnNjaGVtYS8xLTAtMSIsImRhdGEiOnsiZGF0YV9zb3VyY2UiOiJyZWRpc19obGwiLCJldmVudF9uYW1lIjoiaV9jb2RlX3Jldmlld191c2VyX3NlYXJjaGVzX2RpZmYifX1dfQ==\",
+  \"p\":\"srv\",
+  \"dtm\":\"1744206220253\",
+  \"tna\":\"gl\",
+  \"tv\":\"rb-0.8.0\",
+  \"eid\":\"4f067989-d10d-40b0-9312-ad9d7355be7f\"
+}
+```
+
+To analyze these logs, you can use the `scripts/product_usage_data_event_formatter.rb` tool which formats the JSON output and decodes base64-encoded context data for better readability:
+
+```shell
+scripts/product_usage_data_event_formatter.rb log/product_usage_data.log
+# or pipe the logs directly
+cat log/product_usage_data.log | scripts/product_usage_data_event_formatter.rb
+# or tail the logs in real-time
+tail -f log/product_usage_data.log | scripts/product_usage_data_event_formatter.rb
+```
+
+You can disable this log by setting the `GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING` environment variable to any value.
+
 ## Let's Encrypt logs
 
 For Linux package installations, Let's Encrypt [auto-renew](https://docs.gitlab.com/omnibus/settings/ssl/#renew-the-certificates-automatically) logs are in `/var/log/gitlab/lets-encrypt/`.
diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index 469a13be036..b46ee5a7e81 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -862,11 +862,11 @@ patroni['remove_data_directory_on_diverged_timelines'] = false
 
 [The upstream documentation is always more up to date](https://patroni.readthedocs.io/en/latest/patroni_configuration.html), but the table below should provide a minimal overview of functionality.
 
-|Setting|Overview|
-|-|-|
-|`use_pg_rewind`|Try running `pg_rewind` on the former cluster leader before it rejoins the database cluster.|
-|`remove_data_directory_on_rewind_failure`|If `pg_rewind` fails, remove the local PostgreSQL data directory and re-replicate from the current cluster leader.|
-|`remove_data_directory_on_diverged_timelines`|If `pg_rewind` cannot be used and the former leader's timeline has diverged from the current one, delete the local data directory and re-replicate from the current cluster leader.|
+| Setting                                       | Overview |
+|-----------------------------------------------|----------|
+| `use_pg_rewind`                               | Try running `pg_rewind` on the former cluster leader before it rejoins the database cluster. |
+| `remove_data_directory_on_rewind_failure`     | If `pg_rewind` fails, remove the local PostgreSQL data directory and re-replicate from the current cluster leader. |
+| `remove_data_directory_on_diverged_timelines` | If `pg_rewind` cannot be used and the former leader's timeline has diverged from the current one, delete the local data directory and re-replicate from the current cluster leader. |
 
 ### Database authorization for Patroni
 
diff --git a/doc/administration/self_hosted_models/related_topics.md b/doc/administration/self_hosted_models/related_topics.md
deleted file mode 100644
index f2d64fc255b..00000000000
--- a/doc/administration/self_hosted_models/related_topics.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-stage: AI-powered
-group: Custom Models
-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: Self-Hosted model setup Related topics
-title: Self-Hosted model setup related topics
----
-
-{{< details >}}
-
-- Tier: Ultimate
-- Add-on: GitLab Duo Enterprise
-- Offering: GitLab Self-Managed
-- Status: Beta
-
-{{< /details >}}
-
-{{< history >}}
-
-- [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [with a flag](../feature_flags.md) named `ai_custom_model`. Disabled by default.
-- [Enabled on GitLab Self-Managed](https://gitlab.com/groups/gitlab-org/-/epics/15176) in GitLab 17.6.
-- Changed to require GitLab Duo add-on in GitLab 17.6 and later.
-- Feature flag `ai_custom_model` removed in GitLab 17.8
-
-{{< /history >}}
-
-## AWS Bedrock
-
-- [Import Custom Models Into Amazon Bedrock](https://www.youtube.com/watch?v=CA2AXfWWdpA)
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index 4cec42d6629..738cd504e58 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -367,7 +367,7 @@ Elements in the `allowed_to_push` / `allowed_to_merge` / `allowed_to_unprotect`
 form `{user_id: integer}`, `{group_id: integer}`, or `{access_level: integer}`.
 Each user must have access to the project and each group must [have this project shared](../user/project/members/sharing_projects_groups.md).
 These access levels allow more granular control over protected branch access.
-For more information, see [Add a group to protected branches](../user/project/repository/branches/protected.md#add-a-group-to-protected-branches).
+For more information, see [configure group permissions](../user/project/repository/branches/protected.md#with-group-permissions).
 
 The following example request creates a protected branch with user push access and group merge access.
 The `user_id` is `2` and the `group_id` is `3`.
@@ -439,7 +439,7 @@ The following example response includes:
 Elements in the `allowed_to_push` array should take the form `{user_id: integer}`, `{group_id: integer}`,
 `{deploy_key_id: integer}`, or `{access_level: integer}`.
 The deploy key must be enabled for your project and it must have write access to your project repository.
-For other requirements, see [Allow deploy keys to push to a protected branch](../user/project/repository/branches/protected.md#allow-deploy-keys-to-push-to-a-protected-branch).
+For other requirements, see [Allow deploy keys to push to a protected branch](../user/project/repository/branches/protected.md#enable-deploy-key-access).
 
 ```shell
 curl --request POST \
diff --git a/doc/ci/components/_index.md b/doc/ci/components/_index.md
index fadb3e717e0..c81222dd457 100644
--- a/doc/ci/components/_index.md
+++ b/doc/ci/components/_index.md
@@ -842,7 +842,7 @@ you deliver to users, follow these best practices:
 - **Use protected branches**:
   - Use [protected branches](../../user/project/repository/branches/protected.md)
     for component project releases.
-  - Protect the default branch, and protect all release branches [using wildcard rules](../../user/project/repository/branches/protected.md#protect-multiple-branches-with-wildcard-rules).
+  - Protect the default branch, and protect all release branches [using wildcard rules](../../user/project/repository/branches/protected.md#use-wildcard-rules).
   - Require everyone submit merge requests for changes to protected branches. Set the
     **Allowed to push and merge** option to `No one` for protected branches.
   - Block force pushes to protected branches.
diff --git a/doc/ci/pipelines/schedules.md b/doc/ci/pipelines/schedules.md
index 1875350d62c..a112d9e5fa3 100644
--- a/doc/ci/pipelines/schedules.md
+++ b/doc/ci/pipelines/schedules.md
@@ -19,7 +19,7 @@ Use scheduled pipelines to run GitLab CI/CD [pipelines](_index.md) at regular in
 For a scheduled pipeline to run:
 
 - The schedule owner must have the Developer role. For pipelines on protected branches,
-  the schedule owner must be [allowed to merge](../../user/project/repository/branches/protected.md#add-protection-to-existing-branches)
+  the schedule owner must be [allowed to merge](../../user/project/repository/branches/protected.md#protect-a-branch)
   to the branch.
 - The `.gitlab-ci.yml` file must have valid syntax.
 
diff --git a/doc/development/database/pagination_guidelines.md b/doc/development/database/pagination_guidelines.md
index 18c7f7bd0b6..c4f01a1e9bd 100644
--- a/doc/development/database/pagination_guidelines.md
+++ b/doc/development/database/pagination_guidelines.md
@@ -229,18 +229,18 @@ Keyset pagination used in both the [GraphQL API](../graphql_guide/pagination.md#
 
 Consider the following `issues` table:
 
-|`id`|`project_id`|
-|-|-|
-|1|1|
-|2|1|
-|3|2|
-|4|1|
-|5|1|
-|6|2|
-|7|2|
-|8|1|
-|9|1|
-|10|2|
+| `id` | `project_id` |
+|------|--------------|
+| 1    | 1            |
+| 2    | 1            |
+| 3    | 2            |
+| 4    | 1            |
+| 5    | 1            |
+| 6    | 2            |
+| 7    | 2            |
+| 8    | 1            |
+| 9    | 1            |
+| 10   | 2            |
 
 Let's paginate over the whole table ordered by the primary key (`id`). The query for the first page is the same as the offset pagination query, for simplicity, we use 5 as the page size:
 
diff --git a/doc/development/value_stream_analytics.md b/doc/development/value_stream_analytics.md
index 04844f83b3a..dc9abe628a6 100644
--- a/doc/development/value_stream_analytics.md
+++ b/doc/development/value_stream_analytics.md
@@ -31,20 +31,20 @@ Apart from the durations, we expose the record count within a stage.
 - Project level (licensed): We are continually adding features to project level VSA to bring it in line with group level VSA.
 - Project level (FOSS): Keep it as is.
 
-|Feature|Group level (licensed)|Project level (licensed)|Project level (FOSS)|
-|-|-|-|-|
-|Create custom value streams|Yes|No, only one value stream (default) is present with the default stages|no, only one value stream (default) is present with the default stages|
-|Create custom stages|Yes|No|No|
-|Filtering (author, label, milestone, etc.)|Yes|Yes|Yes|
-|Stage time chart|Yes|No|No|
-|Total time chart|Yes|No|No|
-|Task by type chart|Yes|No|No|
-|DORA Metrics|Yes|Yes|No|
-|Cycle time and lead time summary (Lifecycle metrics)|Yes|Yes|No|
-|New issues, commits and deploys (Lifecycle metrics)|Yes, excluding commits|Yes|Yes|
-|Uses aggregated backend|Yes|No|No|
-|Date filter behavior|Filters items [finished within the date range](https://gitlab.com/groups/gitlab-org/-/epics/6046)|Filters items by creation date.|Filters items by creation date.|
-|Authorization|At least reporter|At least reporter|Can be public.|
+| Feature                                              | Group level (licensed)                                                                        | Project level (licensed)                                               | Project level (FOSS) |
+|------------------------------------------------------|-----------------------------------------------------------------------------------------------|------------------------------------------------------------------------|----------------------|
+| Create custom value streams                          | Yes                                                                                           | No, only one value stream (default) is present with the default stages | No, only one value stream (default) is present with the default stages |
+| Create custom stages                                 | Yes                                                                                           | No                                                                     | No                   |
+| Filtering (author, label, milestone, etc.)           | Yes                                                                                           | Yes                                                                    | Yes                  |
+| Stage time chart                                     | Yes                                                                                           | No                                                                     | No                   |
+| Total time chart                                     | Yes                                                                                           | No                                                                     | No                   |
+| Task by type chart                                   | Yes                                                                                           | No                                                                     | No                   |
+| DORA Metrics                                         | Yes                                                                                           | Yes                                                                    | No                   |
+| Cycle time and lead time summary (Lifecycle metrics) | Yes                                                                                           | Yes                                                                    | No                   |
+| New issues, commits and deploys (Lifecycle metrics)  | Yes, excluding commits                                                                        | Yes                                                                    | Yes                  |
+| Uses aggregated backend                              | Yes                                                                                           | No                                                                     | No                   |
+| Date filter behavior                                 | Filters items [finished in the date range](https://gitlab.com/groups/gitlab-org/-/epics/6046) | Filters items by creation date.                                        | Filters items by creation date. |
+| Authorization                                        | At least reporter                                                                             | At least reporter                                                      | Can be public.       |
 
 ## VSA core domain objects
 
diff --git a/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md b/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md
index 5f2111c6184..e2b08e5d4f7 100644
--- a/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md
+++ b/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md
@@ -186,17 +186,17 @@ Both tables are hash partitioned by the `stage_event_hash_id`. Each table uses 3
 an arbitrary number and it could be changed. Important is to keep the partitions under 100 GB in
 size (which gives the feature a lot of headroom).
 
-|Column|Description|
-|-|-|
-|`stage_event_hash_id`|partitioning key|
-|`merge_request_id` or `issue_id`|reference to the domain record (Issuable)|
-|`group_id`|reference to the group (de-normalization)|
-|`project_id`|reference to the project|
-|`milestone_id`|duplicated data from the domain record table|
-|`author_id`|duplicated data from the domain record table|
-|`state_id`|duplicated data from the domain record table|
-|`start_event_timestamp`|timestamp derived from the stage configuration|
-|`end_event_timestamp`|timestamp derived from the stage configuration|
+| Column                           | Description |
+|----------------------------------|-------------|
+| `stage_event_hash_id`            | partitioning key |
+| `merge_request_id` or `issue_id` | reference to the domain record (Issuable) |
+| `group_id`                       | reference to the group (de-normalization) |
+| `project_id`                     | reference to the project |
+| `milestone_id`                   | duplicated data from the domain record table |
+| `author_id`                      | duplicated data from the domain record table |
+| `state_id`                       | duplicated data from the domain record table |
+| `start_event_timestamp`          | timestamp derived from the stage configuration |
+| `end_event_timestamp`            | timestamp derived from the stage configuration |
 
 With accordance to the data separation requirements, the table doesn't have any foreign keys. The
 consistency is ensured by a background job (eventually consistent).
@@ -236,18 +236,18 @@ Thanks to this, we can easily switch between the old and new query backends.
 
 VSA supports various filters on the base query. Most of the filters require no additional JOINs:
 
-|Filter name|Description|
-|-|-|
-|`milestone_title`|The backend translates it to `milestone_id` filter|
-|`author_username`|The backend translates it to `author_id` filter|
-|`project_ids`|Only used on the group-level|
+| Filter name       | Description |
+|-------------------|-------------|
+| `milestone_title` | The backend translates it to `milestone_id` filter |
+| `author_username` | The backend translates it to `author_id` filter |
+| `project_ids`     | Only used on the group-level |
 
 Exceptions: these filters are applied on other tables which means we `JOIN` them.
 
-|Filter name|Description|
-|-|-|
-|`label_name`|Array filter, using the `label_links` table|
-|`assignee_username`|Array filter, using the `*_assignees` table|
+| Filter name         | Description |
+|---------------------|-------------|
+| `label_name`        | Array filter, using the `label_links` table |
+| `assignee_username` | Array filter, using the `*_assignees` table |
 
 To fully decompose the database, the required ID values would need to be replicated in the VSA
 database tables. This change could be implemented using array columns.
diff --git a/doc/integration/jira/_index.md b/doc/integration/jira/_index.md
index 2e7ebed6e06..b933d21dd7a 100644
--- a/doc/integration/jira/_index.md
+++ b/doc/integration/jira/_index.md
@@ -60,18 +60,18 @@ including related branches, commits, and merge requests. To configure the Jira d
 
 This table shows the features available with the Jira issues integration and the Jira development panel:
 
-| Feature | Jira issues integration | Jira development panel |
-|-|-|-|
-| Mention a Jira issue ID in a GitLab commit or merge request, and a link to the Jira issue is created. | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No |
-| Mention a Jira issue ID in GitLab, and the Jira issue shows the GitLab issue or merge request. | {{< icon name="check-circle" >}} Yes, a Jira comment with the GitLab issue or merge request title links to GitLab. The first mention is also added to **Web links** in the Jira issue. | {{< icon name="check-circle" >}} Yes, in the Jira issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). |
-| Mention a Jira issue ID in a GitLab commit, and the Jira issue shows the commit message. | {{< icon name="check-circle" >}} Yes, the entire commit message is displayed in the Jira issue as a comment and in **Web links**. Each message links back to the commit in GitLab. | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. A custom comment is possible with [Jira Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html). |
-| Mention a Jira issue ID in a GitLab branch name, and the Jira issue shows the branch name. | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
-| Add time tracking to a Jira issue. | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes, with Jira Smart Commits. |
-| Use a GitLab commit or merge request to transition a Jira issue. |{{< icon name="check-circle" >}} Yes, only a single transition. Typically used to close the Jira issue. | {{< icon name="check-circle" >}} Yes, transition the Jira issue to any state with Jira Smart Commits. |
-| [View a list of Jira issues](configure.md#view-jira-issues). | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No |
-| [Create a Jira issue for a vulnerability](configure.md#create-a-jira-issue-for-a-vulnerability). | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No |
-| Create a GitLab branch from a Jira issue. | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
-| Mention a Jira issue ID in a GitLab merge request, branch name, or any of the last 2,000 commits to the branch after the last successful deployment to the environment to sync a GitLab deployment to a Jira issue. | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
+| Feature                                                                                                                                                                                                             | Jira issues integration                                                                                                                                                                | Jira development panel |
+|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|
+| Mention a Jira issue ID in a GitLab commit or merge request, and a link to the Jira issue is created.                                                                                                               | {{< icon name="check-circle" >}} Yes                                                                                                                                                   | {{< icon name="dotted-circle" >}} No |
+| Mention a Jira issue ID in GitLab, and the Jira issue shows the GitLab issue or merge request.                                                                                                                      | {{< icon name="check-circle" >}} Yes, a Jira comment with the GitLab issue or merge request title links to GitLab. The first mention is also added to **Web links** in the Jira issue. | {{< icon name="check-circle" >}} Yes, in the Jira issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). |
+| Mention a Jira issue ID in a GitLab commit, and the Jira issue shows the commit message.                                                                                                                            | {{< icon name="check-circle" >}} Yes, the entire commit message is displayed in the Jira issue as a comment and in **Web links**. Each message links back to the commit in GitLab.     | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. A custom comment is possible with [Jira Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html). |
+| Mention a Jira issue ID in a GitLab branch name, and the Jira issue shows the branch name.                                                                                                                          | {{< icon name="dotted-circle" >}} No                                                                                                                                                   | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
+| Add time tracking to a Jira issue.                                                                                                                                                                                  | {{< icon name="dotted-circle" >}} No                                                                                                                                                   | {{< icon name="check-circle" >}} Yes, with Jira Smart Commits. |
+| Use a GitLab commit or merge request to transition a Jira issue.                                                                                                                                                    | {{< icon name="check-circle" >}} Yes, only a single transition. Typically used to close the Jira issue.                                                                                | {{< icon name="check-circle" >}} Yes, transition the Jira issue to any state with Jira Smart Commits. |
+| [View a list of Jira issues](configure.md#view-jira-issues).                                                                                                                                                        | {{< icon name="check-circle" >}} Yes                                                                                                                                                   | {{< icon name="dotted-circle" >}} No |
+| [Create a Jira issue for a vulnerability](configure.md#create-a-jira-issue-for-a-vulnerability).                                                                                                                    | {{< icon name="check-circle" >}} Yes                                                                                                                                                   | {{< icon name="dotted-circle" >}} No |
+| Create a GitLab branch from a Jira issue.                                                                                                                                                                           | {{< icon name="dotted-circle" >}} No                                                                                                                                                   | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
+| Mention a Jira issue ID in a GitLab merge request, branch name, or any of the last 2,000 commits to the branch after the last successful deployment to the environment to sync a GitLab deployment to a Jira issue. | {{< icon name="dotted-circle" >}} No                                                                                                                                                   | {{< icon name="check-circle" >}} Yes, in the Jira issue's development panel. |
 
 ## Privacy considerations
 
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index d638370af42..5f3ddd50d0e 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -267,7 +267,7 @@ you can't force push unless you:
 - Unprotect it.
 - Allow force pushes.
 
-For more information, see [Allow force push on a protected branch](../../user/project/repository/branches/protected.md#allow-force-push-on-a-protected-branch).
+For more information, see [Allow force push on a protected branch](../../user/project/repository/branches/protected.md#allow-force-push).
 
 ## Restore your backed up branch
 
diff --git a/doc/user/analytics/ci_cd_analytics.md b/doc/user/analytics/ci_cd_analytics.md
index 16400902c9c..dbb872b6840 100644
--- a/doc/user/analytics/ci_cd_analytics.md
+++ b/doc/user/analytics/ci_cd_analytics.md
@@ -19,6 +19,12 @@ Use the CI/CD analytics page to view pipeline success rates and duration, and th
 CI/CD analytics shows the history of your pipeline successes and failures, as well as how long each pipeline
 ran.
 
+{{< history >}}
+
+- [Updated](https://gitlab.com/gitlab-org/gitlab/-/issues/353607) in GitLab 18.0 to improve analytics by using ClickHouse as the data source when available.
+
+{{< /history >}}
+
 Pipeline statistics are gathered by collecting all available pipelines for the
 project, regardless of status. The data available for each individual day is based
 on when the pipeline was created.
diff --git a/doc/user/application_security/policies/merge_request_approval_policies.md b/doc/user/application_security/policies/merge_request_approval_policies.md
index a80761b00ed..b1ef5330d60 100644
--- a/doc/user/application_security/policies/merge_request_approval_policies.md
+++ b/doc/user/application_security/policies/merge_request_approval_policies.md
@@ -399,7 +399,7 @@ The settings set in the policy overwrite settings in the project.
 | Field                               | Type                  | Required | Possible values                                               | Applicable rule type | Description |
 |-------------------------------------|-----------------------|----------|---------------------------------------------------------------|----------------------|-------------|
 | `block_branch_modification`         | `boolean`             | false    | `true`, `false`                                               | All                  | When enabled, prevents a user from removing a branch from the protected branches list, deleting a protected branch, or changing the default branch if that branch is included in the security policy. This ensures users cannot remove protection status from a branch to merge vulnerable code. Enforced based on `branches`, `branch_type` and `policy_scope` and regardless of detected vulnerabilities. |
-| `block_group_branch_modification`   | `boolean` or `object` | false    | `true`, `false`, `{ enabled: boolean, exceptions: [{ id: Integer}] }` | All                  | When enabled, prevents a user from removing group-level protected branches on every group the policy applies to. If `block_branch_modification` is `true`, implicitly defaults to `true`. Add top-level groups that support [group-level protected branches](../../project/repository/branches/protected.md#for-all-projects-in-a-group) as `exceptions` |
+| `block_group_branch_modification`   | `boolean` or `object` | false    | `true`, `false`, `{ enabled: boolean, exceptions: [{ id: Integer}] }` | All                  | When enabled, prevents a user from removing group-level protected branches on every group the policy applies to. If `block_branch_modification` is `true`, implicitly defaults to `true`. Add top-level groups that support [group-level protected branches](../../project/repository/branches/protected.md#in-a-group) as `exceptions` |
 | `prevent_approval_by_author`        | `boolean`             | false    | `true`, `false`                                               | `Any merge request`  | When enabled, merge request authors cannot approve their own MRs. This ensures code authors cannot introduce vulnerabilities and approve code to merge. |
 | `prevent_approval_by_commit_author` | `boolean`             | false    | `true`, `false`                                               | `Any merge request`  | When enabled, users who have contributed code to the MR are ineligible for approval. This ensures code committers cannot introduce vulnerabilities and approve code to merge. |
 | `remove_approvals_with_new_commit`  | `boolean`             | false    | `true`, `false`                                               | `Any merge request`  | When enabled, if an MR receives all necessary approvals to merge, but then a new commit is added, new approvals are required. This ensures new commits that may include vulnerabilities cannot be introduced. |
diff --git a/doc/user/compliance/_index.md b/doc/user/compliance/_index.md
index b3265b1b8ce..6c1483da9e4 100644
--- a/doc/user/compliance/_index.md
+++ b/doc/user/compliance/_index.md
@@ -60,7 +60,7 @@ and secure supply chain best practices:
 | [Granular user roles<br/>and flexible permissions](../permissions.md)                                                                                                                                                                                                  | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | Manage access and permissions with five different user roles and settings for external users. Set permissions according to people's role, rather than either read or write access to a repository. Don't share the source code with people that only need access to the issue tracker. |
 | [Merge request approvals](../project/merge_requests/approvals/_index.md)                                                                                                                                                                                               | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | Configure approvals required for merge requests. |
 | [Push rules](../project/repository/push_rules.md)                                                                                                                                                                                                                      | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | Control pushes to your repositories. |
-| Separation of duties using<br/>[protected branches](../project/repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch) and<br/>[custom CI/CD configuration paths](../../ci/pipelines/settings.md#specify-a-custom-cicd-configuration-file) | {{< icon name="dotted-circle" >}} No | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes | Leverage the GitLab cross-project YAML configurations to define deployers of code and developers of code. See how to use this setup to define these roles in the [Separation of Duties deploy project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and the [Separation of Duties project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md). |
+| Separation of duties using<br/>[protected branches](../project/repository/branches/protected.md#require-code-owner-approval) and<br/>[custom CI/CD configuration paths](../../ci/pipelines/settings.md#specify-a-custom-cicd-configuration-file) | {{< icon name="dotted-circle" >}} No | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes | Leverage the GitLab cross-project YAML configurations to define deployers of code and developers of code. See how to use this setup to define these roles in the [Separation of Duties deploy project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and the [Separation of Duties project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md). |
 | [Security policies](../application_security/policies/_index.md)                                                                                                                                                                                                        | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | Configure customizable policies that require merge request approval based on policy rules, or enforce security scanners to execute in project pipelines for compliance requirements. Policies can be enforced granularly against specific projects, or all projects in a group or subgroup. |
 
 ## Other compliance features
diff --git a/doc/user/group/value_stream_analytics/_index.md b/doc/user/group/value_stream_analytics/_index.md
index db2939bd560..b905342be83 100644
--- a/doc/user/group/value_stream_analytics/_index.md
+++ b/doc/user/group/value_stream_analytics/_index.md
@@ -43,20 +43,20 @@ Value stream analytics offers different features at the project and group level
 - On GitLab Free, value stream analytics does not aggregate data. It queries the database directly where the date range filter is applied to the creation date of issues and merge request. You can view value stream analytics with pre-defined default stages.
 - On GitLab Premium, value stream analytics aggregates data and applies the date range filter on the end event. You can also create, edit, and delete value streams.
 
-|Feature|Group level (licensed)|Project level (licensed)|Project level (FOSS)|
-|-|-|-|-|
-|Create custom value streams|Yes|Yes|no, only one value stream (default) is present with the default stages|
-|Create custom stages|Yes|Yes|No|
-|Filtering (for example, by author, label, milestone)|Yes|Yes|Yes|
-|Stage time chart|Yes|Yes|No|
-|Total time chart|Yes|Yes|No|
-|Task by type chart|Yes|No|No|
-|DORA Metrics|Yes|Yes|No|
-|Cycle time and lead time summary (Lifecycle metrics)|Yes|Yes|No|
-|New issues, commits, and deploys (Lifecycle metrics)|Yes, excluding commits|Yes|Yes|
-|Uses aggregated backend|Yes|Yes|No|
-|Date filter behavior|Filters items [finished within the date range](https://gitlab.com/groups/gitlab-org/-/epics/6046)|Filters items by creation date.|Filters items by creation date.|
-|Authorization|At least reporter|At least reporter|Can be public|
+| Feature                                              | Group level (licensed)                                                                        | Project level (licensed)        | Project level (FOSS) |
+|------------------------------------------------------|-----------------------------------------------------------------------------------------------|---------------------------------|----------------------|
+| Create custom value streams                          | Yes                                                                                           | Yes                             | No, only one value stream (default) is present with the default stages |
+| Create custom stages                                 | Yes                                                                                           | Yes                             | No                   |
+| Filtering (for example, by author, label, milestone) | Yes                                                                                           | Yes                             | Yes                  |
+| Stage time chart                                     | Yes                                                                                           | Yes                             | No                   |
+| Total time chart                                     | Yes                                                                                           | Yes                             | No                   |
+| Task by type chart                                   | Yes                                                                                           | No                              | No                   |
+| DORA Metrics                                         | Yes                                                                                           | Yes                             | No                   |
+| Cycle time and lead time summary (Lifecycle metrics) | Yes                                                                                           | Yes                             | No                   |
+| New issues, commits, and deploys (Lifecycle metrics) | Yes, excluding commits                                                                        | Yes                             | Yes                  |
+| Uses aggregated backend                              | Yes                                                                                           | Yes                             | No                   |
+| Date filter behavior                                 | Filters items [finished in the date range](https://gitlab.com/groups/gitlab-org/-/epics/6046) | Filters items by creation date. | Filters items by creation date. |
+| Authorization                                        | At least reporter                                                                             | At least reporter               | Can be public        |
 
 ## How value stream analytics works
 
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 76651f63858..b6a97071fdd 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -387,7 +387,7 @@ Project permissions for [repository](project/repository/_index.md) features incl
 | Manage [protected tags](project/protected_tags.md)                    |       |         |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | Manage [push rules](project/repository/push_rules.md)                 |       |         |          |           |     ✓      |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | Remove fork relationship                                              |       |         |          |           |            |   ✓   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| Force push to protected branches                                      |       |         |          |           |            |       | Not allowed for Guest, Reporter, Developer, Maintainer, or Owner. See [protected branches](project/repository/branches/protected.md#allow-force-push-on-a-protected-branch).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| Force push to protected branches                                      |       |         |          |           |            |       | Not allowed for Guest, Reporter, Developer, Maintainer, or Owner. See [protected branches](project/repository/branches/protected.md#allow-force-push).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 
 ### Merge requests
 
diff --git a/doc/user/project/codeowners/_index.md b/doc/user/project/codeowners/_index.md
index bcac35e57cb..bc02b1d9a5b 100644
--- a/doc/user/project/codeowners/_index.md
+++ b/doc/user/project/codeowners/_index.md
@@ -56,11 +56,11 @@ For example:
 To ensure merge request changes are reviewed and approved by Code Owners, specified in the
 [`CODEOWNERS` file](#codeowners-file), the merge request's target branch must be
 [protected](../repository/branches/protected.md)
-and [Code Owner approval](../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch) must be enabled.
+and [Code Owner approval](../repository/branches/protected.md#require-code-owner-approval) must be enabled.
 
 The following features are available when you enable Code Owner approvals on protected branches:
 
-- [Require approvals from Code Owners](../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch).
+- [Require approvals from Code Owners](../repository/branches/protected.md#require-code-owner-approval).
 - [Require multiple approvals from Code Owners](advanced.md#require-multiple-approvals-from-code-owners).
 - [Optional approvals from Code Owners](reference.md#optional-sections).
 
@@ -97,7 +97,7 @@ Prerequisites:
 1. Define some rules in the file following the [`CODEOWNERS` syntax](reference.md).
    Some suggestions:
    - Configure [All eligible approvers](../merge_requests/approvals/rules.md#code-owners-as-eligible-approvers) approval rule.
-   - [Require Code Owner approval](../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch) on a protected branch.
+   - [Require Code Owner approval](../repository/branches/protected.md#require-code-owner-approval) on a protected branch.
 1. Commit your changes, and push them up to GitLab.
 
 ## `CODEOWNERS` file
diff --git a/doc/user/project/codeowners/troubleshooting.md b/doc/user/project/codeowners/troubleshooting.md
index fe41b52ecaf..977509d9785 100644
--- a/doc/user/project/codeowners/troubleshooting.md
+++ b/doc/user/project/codeowners/troubleshooting.md
@@ -32,7 +32,7 @@ A Code Owner approval rule is optional if any of these conditions are true:
 - The user or group is not a member of the project.
   Code Owners [cannot inherit members from parent groups](https://gitlab.com/gitlab-org/gitlab/-/issues/288851/).
 - The user or group is [malformed or inaccessible](advanced.md#malformed-owners).
-- [Code Owner approval on a protected branch](../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch) has not been set up.
+- [Code Owner approval on a protected branch](../repository/branches/protected.md#require-code-owner-approval) has not been set up.
 - The section is [marked as optional](reference.md#optional-sections).
 - No eligible code owners are available to approve the merge request due to conflicts
   with other [merge request approval settings](../merge_requests/approvals/settings.md).
diff --git a/doc/user/project/deploy_keys/_index.md b/doc/user/project/deploy_keys/_index.md
index 1a1ad4378ae..4a1ecdaf661 100644
--- a/doc/user/project/deploy_keys/_index.md
+++ b/doc/user/project/deploy_keys/_index.md
@@ -204,7 +204,7 @@ There are a few scenarios where a deploy key fails to push to a
 - The owner associated to a deploy key has [project membership permissions](../../permissions.md#project-members-permissions) lower than required to **View project code**.
 - The deploy key does not have [read-write permissions for the project](#edit-project-access-permissions-of-a-deploy-key).
 - The deploy key has been [revoked](#revoke-project-access-of-a-deploy-key).
-- **No one** is selected in [the **Allowed to push and merge** section](../repository/branches/protected.md#add-protection-to-existing-branches) of the protected branch.
+- **No one** is selected in [the **Allowed to push and merge** section](../repository/branches/protected.md#protect-a-branch) of the protected branch.
 
 This issue occurs because all deploy keys are associated to an account. Because the permissions for an account can change, this might lead to scenarios where a deploy key that was working is suddenly unable to push to a protected branch.
 
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 470ada02b25..e5ac3c0b128 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -428,11 +428,11 @@ When they are imported, supported GitHub branch protection rules are mapped to e
 | GitHub rule                                                                                         | GitLab rule                                                                                                                                                                                                                                                          | Introduced in |
 |:----------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------|
 | **Require conversation resolution before merging** for the project's default branch                 | **All threads must be resolved** [project setting](../merge_requests/_index.md#prevent-merge-unless-all-threads-are-resolved)                                                                                                                                         | [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/371110) |
-| **Require a pull request before merging**                                                           | **No one** option in the **Allowed to push and merge** list of [branch protection settings](../repository/branches/protected.md#add-protection-to-existing-branches)                                                                                                            | [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/370951) |
+| **Require a pull request before merging**                                                           | **No one** option in the **Allowed to push and merge** list of [branch protection settings](../repository/branches/protected.md#protect-a-branch)                                                                                                            | [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/370951) |
 | **Require signed commits** for the project's default branch                                         | **Reject unsigned commits** GitLab [push rule](../repository/push_rules.md#prevent-unintended-consequences)                                                                                                                                                          | [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/370949) |
-| **Allow force pushes - Everyone**                                                                   | **Allowed to force push** [branch protection setting](../repository/branches/protected.md#allow-force-push-on-a-protected-branch)                                                                                                                                               | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/370943) |
-| **Require a pull request before merging - Require review from Code Owners**                         | **Require approval from code owners** [branch protection setting](../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch)                                                                                                                        | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/376683) |
-| **Require a pull request before merging - Allow specified actors to bypass required pull requests** | List of users in the **Allowed to push and merge** list of [branch protection settings](../repository/branches/protected.md#add-protection-to-existing-branches). Without a **Premium** subscription, the list of users that are allowed to push and merge is limited to roles. | [GitLab 15.8](https://gitlab.com/gitlab-org/gitlab/-/issues/384939) |
+| **Allow force pushes - Everyone**                                                                   | **Allowed to force push** [branch protection setting](../repository/branches/protected.md#allow-force-push)                                                                                                                                               | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/370943) |
+| **Require a pull request before merging - Require review from Code Owners**                         | **Require approval from code owners** [branch protection setting](../repository/branches/protected.md#require-code-owner-approval)                                                                                                                        | [GitLab 15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/376683) |
+| **Require a pull request before merging - Allow specified actors to bypass required pull requests** | List of users in the **Allowed to push and merge** list of [branch protection settings](../repository/branches/protected.md#protect-a-branch). Without a **Premium** subscription, the list of users that are allowed to push and merge is limited to roles. | [GitLab 15.8](https://gitlab.com/gitlab-org/gitlab/-/issues/384939) |
 
 Mapping GitHub rule **Require status checks to pass before merging** to
 [external status checks](../merge_requests/status_checks.md) was considered in issue
diff --git a/doc/user/project/integrations/google_artifact_management.md b/doc/user/project/integrations/google_artifact_management.md
index ab61d667fe5..def7e599e37 100644
--- a/doc/user/project/integrations/google_artifact_management.md
+++ b/doc/user/project/integrations/google_artifact_management.md
@@ -70,11 +70,11 @@ To view the list of images in the connected Artifact Registry repository in the
 After the Artifact Registry integration is activated, the following predefined environment variables are available in CI/CD.
 You can use these environment variables to interact with the Artifact Registry, like pulling or pushing an image to the connected repository.
 
-| Variable | GitLab | Runner | Description |
-|-|-|-|-|
-| `GOOGLE_ARTIFACT_REGISTRY_PROJECT_ID` | 16.10 | 16.10 | The Google Cloud project ID where the Artifact Registry repository is located. |
-| `GOOGLE_ARTIFACT_REGISTRY_REPOSITORY_NAME` | 16.10  | 16.10 | The name of the connected Artifact Registry repository. |
-| `GOOGLE_ARTIFACT_REGISTRY_REPOSITORY_LOCATION` | 16.10  | 16.10 | The Google Cloud location of the connected Artifact Registry repository. |
+| Variable                                       | GitLab | Runner | Description |
+|------------------------------------------------|--------|--------|-------------|
+| `GOOGLE_ARTIFACT_REGISTRY_PROJECT_ID`          | 16.10  | 16.10  | The Google Cloud project ID where the Artifact Registry repository is located. |
+| `GOOGLE_ARTIFACT_REGISTRY_REPOSITORY_NAME`     | 16.10  | 16.10  | The name of the connected Artifact Registry repository. |
+| `GOOGLE_ARTIFACT_REGISTRY_REPOSITORY_LOCATION` | 16.10  | 16.10  | The Google Cloud location of the connected Artifact Registry repository. |
 
 ### Authenticate with the Google Artifact Registry
 
diff --git a/doc/user/project/merge_requests/approvals/rules.md b/doc/user/project/merge_requests/approvals/rules.md
index 7c4de5b88c8..0f3892d1a5a 100644
--- a/doc/user/project/merge_requests/approvals/rules.md
+++ b/doc/user/project/merge_requests/approvals/rules.md
@@ -200,7 +200,7 @@ become eligible approvers in the project. To enable this merge request approval
 1. In the **Approvals required** column, enter the number of approvals required.
 
 You can also
-[require code owner approval](../../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch)
+[require code owner approval](../../repository/branches/protected.md#require-code-owner-approval)
 for protected branches.
 
 ## Enable approval permissions for users with the Reporter role
@@ -298,7 +298,7 @@ approval rule for certain branches:
    - To apply the rule to all protected branches, select **All protected branches**.
    - To apply the rule to a specific branch, select it from the list.
 1. To enable this configuration, follow
-   [Require Code Owner approval on a protected branch](../../repository/branches/protected.md#require-code-owner-approval-on-a-protected-branch).
+   [Require Code Owner approval on a protected branch](../../repository/branches/protected.md#require-code-owner-approval).
 
 ## Security Approvals
 
diff --git a/doc/user/project/repository/branches/protected.md b/doc/user/project/repository/branches/protected.md
index fd1c406d69d..ae90c60093c 100644
--- a/doc/user/project/repository/branches/protected.md
+++ b/doc/user/project/repository/branches/protected.md
@@ -19,8 +19,7 @@ to ensure code stability and quality. Protected branches:
 - Control which users can merge and push code changes.
 - Prevent accidental deletion of critical branches.
 - Enforce code review and approval processes.
-- Manage [Code Owner](#require-code-owner-approval-on-a-protected-branch) approval
-  and `CODEOWNERS` file restrictions.
+- Manage [Code Owner approval](protection_rules.md#code-owner-approval) requirements.
 - Regulate force push permissions to maintain commit history.
 - Control access through both the UI and the
   [Protected branches API](../../../../api/protected_branches.md).
@@ -31,72 +30,14 @@ The [default branch](default.md) for your repository is protected by default.
 
 {{< /alert >}}
 
-## Who can modify a protected branch
+For information about how protection rules behave when a branch matches multiple rules or has
+complex permission requirements, see [Protection rules and permissions](protection_rules.md).
 
-{{< history >}}
+## Protect a branch
 
-- Branch push permission [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118532) to require GitLab administrators to also have the **allowed** permission in GitLab 16.0.
+Configure protected branches for individual projects or for all projects in a group.
 
-{{< /history >}}
-
-When a branch is protected, the default behavior enforces these restrictions on the branch.
-
-| Action                   | Who can do it                           |
-|:-------------------------|:----------------------------------------|
-| Protect a branch         | At least the Maintainer role.           |
-| Push to the branch       | Anyone with **Allowed** permission. (1) |
-| Force push to the branch | No one.                                 |
-| Delete the branch        | No one. (2)                             |
-
-1. Users with the Developer role can create a project in a group, but might not be allowed to
-   initially push to the [default branch](default.md).
-1. No one can delete a protected branch using Git commands, however, users with at least Maintainer
-   role can [delete a protected branch from the UI or API](#delete-a-protected-branch).
-
-### When a branch matches multiple rules
-
-When a branch matches multiple rules, the **most permissive rule** determines the
-level of protection for the branch. For example, consider these rules, which include
-[wildcards](#protect-multiple-branches-with-wildcard-rules):
-
-| Branch name pattern | Allowed to merge       | Allowed to push and merge |
-|---------------------|------------------------|---------------------------|
-| `v1.x`              | Maintainer             | Maintainer                |
-| `v1.*`              | Maintainer + Developer | Maintainer                |
-| `v*`                | No one                 | No one                    |
-
-A branch named `v1.x` is a case-sensitive match for all three branch name patterns: `v1.x`, `v1.*`, and `v*`.
-As the most permissive option determines the behavior, the resulting permissions for branch `v1.x` are:
-
-- **Allowed to merge:** Of the three settings, `Maintainer + Developer` is most permissive,
-  and controls branch behavior as a result. Even though the branch also matched `v1.x` and `v*`
-  (which each have stricter permissions), users with the Developer role can merge into the branch.
-- **Allowed to push and merge:** Of the three settings, `Maintainer` is the most permissive, and controls
-  branch behavior as a result. Even though branches matching `v*` are set to `No one`, branches
-  that _also_ match `v1.x` or `v1.*` receive the more permissive `Maintainer` permission.
-
-To be certain that a rule controls the behavior of a branch,
-_all_ other patterns that match must apply less or equally permissive rules.
-
-If you want to ensure that `No one` is allowed to push to branch `v1.x`, every pattern
-that matches `v1.x` must set `Allowed to push and merge` to `No one`, like this:
-
-| Branch name pattern | Allowed to merge       | Allowed to push and merge |
-|---------------------|------------------------|---------------------------|
-| `v1.x`              | Maintainer             | No one                    |
-| `v1.*`              | Maintainer + Developer | No one                    |
-| `v*`                | No one                 | No one                    |
-
-### Set the default branch protection level
-
-Administrators can [set a default branch protection level](default.md#for-all-projects-in-an-instance)
-in the **Admin** area.
-
-## Add protection to existing branches
-
-Configure protected branches for all projects in a group, or just for a project.
-
-### For one project
+### In a project
 
 Prerequisites:
 
@@ -126,7 +67,7 @@ To protect a branch:
 
 The protected branch displays in the list of protected branches.
 
-### For all projects in a group
+### In a group
 
 {{< details >}}
 
@@ -164,84 +105,12 @@ To protect a branch for all the projects in a group:
 
 The protected branch is added to the list of protected branches.
 
-### Add a group to protected branches
+## Default branch protection settings
 
-To set the members of a group or subgroup as **Allowed to merge** or **Allowed to push and merge**
-to a protected branch:
+Administrators can [set a default branch protection level](default.md#for-all-projects-in-an-instance)
+in the **Admin** area.
 
-1. On the left sidebar, select **Search or go to** and find your project.
-1. Select **Settings > Repository**.
-1. Expand **Protected branches**.
-1. Add groups to the following fields:
-
-   ```plaintext
-   # Allow group members to merge into this branch
-   Allowed to merge: @group-x
-
-   # Allow group members to push and merge into this branch
-   Allowed to push and merge: @group-x/subgroup-y
-   ```
-
-{{< alert type="note" >}}
-
-When you assign a group to a protected branch, only direct members of that group are included.
-Members from parent groups are not automatically granted permissions to the protected branch.
-
-{{< /alert >}}
-
-#### Group inheritance and eligibility
-
-```mermaid
-%%{init: { "fontFamily": "GitLab Sans" }}%%
-graph TD
-    accTitle: Diagram of group inheritance for protected branches
-    accDescr: If a project is shared with a group, the group members inherit permissions for protected branches.
-    A[Parent group X] -->|owns| B[Project A]
-    A -->|contains| C[Subgroup Y]
-    B -->|shared with| C
-    C -->|members inherit permissions| B
-```
-
-In this example:
-
-- **Parent group X** (`group-x`) owns **Project A**.
-- **Parent group X** also contains a subgroup, **Subgroup Y**. (`group-x/subgroup-y`)
-- **Project A** is shared with **Subgroup Y**.
-
-The eligible groups for protected branch permissions are:
-
-- **Project A**: Both **Group X** and **Subgroup Y**, because **Project A** is shared with **Subgroup Y**.
-
-#### Share projects with groups for protected branch permissions
-
-You can share the project with a group or subgroup so that their members are eligible for
-protected branch permissions.
-
-```mermaid
-%%{init: { "fontFamily": "GitLab Sans" }}%%
-graph LR
-    accTitle: Diagram of project sharing for protected branch permissions
-    accDescr: Sharing a project with a group affects whether their members can have protected branch permissions.
-    A[Parent group X] -->|owns| B[Project A]
-    A -->|also contains| C[Subgroup Y]
-    C -.->D{Share Project A<br/>with Subgroup Y?} -.->|yes| E[Members of Subgroup Y<br/>can have protected<br/>branch permissions]
-    D{Share Project A<br/>with Subgroup Y?} -.->|no| F[Members of Subgroup Y<br />cannot have protected<br/>branch permissions]
-    E -.->|Add Subgroup Y<br/> to protected branch settings| I[Subgroup Y members<br/>can merge/push] -.-> B
-    F -.-> |Add Subgroup Y<br/> to protected branch settings| J[Settings will not<br/>take effect] -.-> B
-```
-
-To grant access to **Subgroup Y** members for **Project A**, you must share the project with
-the subgroup. Adding the subgroup directly to the protected branch settings is not effective
-and isn't applicable to subgroup members.
-
-{{< alert type="note" >}}
-
-For a group to have protected branch permissions, the project must be directly shared with the group.
-Inherited project membership from parent groups is not sufficient for protected branch permissions.
-
-{{< /alert >}}
-
-## Protect multiple branches with wildcard rules
+## Use wildcard rules
 
 When using wildcards, multiple rules can apply to a single branch.
 If more than one rule applies to a branch, the _most permissive_ rule controls
@@ -275,7 +144,11 @@ To protect multiple branches at the same time:
 
 The protected branch displays in the list of protected branches.
 
-## Require everyone to submit merge requests for a protected branch
+## Configure protection options
+
+You can set various protection options to secure your branches.
+
+### Require merge requests
 
 You can force everyone to submit a merge request, rather than allowing them to
 check in directly to a protected branch:
@@ -295,9 +168,9 @@ Alternatively, you can [create](branch_rules.md#create-a-branch-rule) or [edit](
 1. Select **Developers and Maintainers**.
 1. Select **Save changes**.
 
-## Allow everyone to push directly to a protected branch
+### Allow direct push
 
-You can allow everyone with write access to push to the protected branch.
+You can allow everyone with write access to push directly to the protected branch.
 
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Settings > Repository**.
@@ -313,7 +186,84 @@ Alternatively, you can [create](branch_rules.md#create-a-branch-rule) or [edit](
 1. Select **Developers and Maintainers**.
 1. Select **Save changes**.
 
-## Allow deploy keys to push to a protected branch
+### With group permissions
+
+To set the members of a group or subgroup as **Allowed to merge** or **Allowed to push and merge**
+to a protected branch:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Settings > Repository**.
+1. Expand **Protected branches**.
+1. Add groups to the following fields:
+
+   ```plaintext
+   # Allow group members to merge into this branch
+   Allowed to merge: @group-x
+
+   # Allow group members to push and merge into this branch
+   Allowed to push and merge: @group-x/subgroup-y
+   ```
+
+{{< alert type="note" >}}
+
+When you assign a group to a protected branch, only direct members of that group are included.
+Members from parent groups are not automatically granted permissions to the protected branch.
+
+{{< /alert >}}
+
+#### Group inheritance requirements
+
+```mermaid
+%%{init: { "fontFamily": "GitLab Sans" }}%%
+graph TD
+    accTitle: Diagram of group inheritance for protected branches
+    accDescr: If a project is shared with a group, the group members inherit permissions for protected branches.
+    A[Parent group X] -->|owns| B[Project A]
+    A -->|contains| C[Subgroup Y]
+    B -->|shared with| C
+    C -->|members inherit permissions| B
+```
+
+In this example:
+
+- **Parent group X** (`group-x`) owns **Project A**.
+- **Parent group X** also contains a subgroup, **Subgroup Y**. (`group-x/subgroup-y`)
+- **Project A** is shared with **Subgroup Y**.
+
+The eligible groups for protected branch permissions are:
+
+- **Project A**: Both **Group X** and **Subgroup Y**, because **Project A** is shared with **Subgroup Y**.
+
+#### Share projects with groups
+
+You can share the project with a group or subgroup so that their members are eligible for
+protected branch permissions.
+
+```mermaid
+%%{init: { "fontFamily": "GitLab Sans" }}%%
+graph LR
+    accTitle: Diagram of project sharing for protected branch permissions
+    accDescr: Sharing a project with a group affects whether their members can have protected branch permissions.
+    A[Parent group X] -->|owns| B[Project A]
+    A -->|also contains| C[Subgroup Y]
+    C -.->D{Share Project A<br/>with Subgroup Y?} -.->|yes| E[Members of Subgroup Y<br/>can have protected<br/>branch permissions]
+    D{Share Project A<br/>with Subgroup Y?} -.->|no| F[Members of Subgroup Y<br />cannot have protected<br/>branch permissions]
+    E -.->|Add Subgroup Y<br/> to protected branch settings| I[Subgroup Y members<br/>can merge/push] -.-> B
+    F -.-> |Add Subgroup Y<br/> to protected branch settings| J[Settings will not<br/>take effect] -.-> B
+```
+
+To grant access to **Subgroup Y** members for **Project A**, you must share the project with
+the subgroup. Adding the subgroup directly to the protected branch settings is not effective
+and isn't applicable to subgroup members.
+
+{{< alert type="note" >}}
+
+For a group to have protected branch permissions, the project must be directly shared with the group.
+Inherited project membership from parent groups is not sufficient for protected branch permissions.
+
+{{< /alert >}}
+
+### Enable deploy key access
 
 You can push to a protected branch with a [deploy key](../../deploy_keys/_index.md).
 
@@ -340,7 +290,7 @@ To allow a deploy key to push to a protected branch:
 
 Deploy keys are not available in the **Allowed to merge** dropdown list.
 
-## Allow force push on a protected branch
+### Allow force push
 
 You can allow [force pushes](../../../../topics/git/git_rebase.md#force-push-to-a-remote-branch) to
 protected branches.
@@ -370,26 +320,7 @@ Alternatively, you can [create](branch_rules.md#create-a-branch-rule) or [edit](
 
 Members who can push to this branch can now also force push.
 
-### When a branch matches multiple rules
-
-When a branch matches multiple rules, the **most permissive rule** determines the
-level of protection for the branch. For example, consider these rules, which include
-[wildcards](#protect-multiple-branches-with-wildcard-rules):
-
-| Branch name pattern | Allow force push |
-|---------------------|------------------|
-| `v1.x`              | Yes              |
-| `v1.*`              | No               |
-| `v*`                | No               |
-
-A branch named `v1.x` matches all three branch name patterns: `v1.x`, `v1.*`, and `v*`.
-As the most permissive option determines the behavior, the resulting permissions for branch `v1.x` are:
-
-- **Allow force push:** Of the three settings, `Yes` is most permissive,
-  and controls branch behavior as a result. Even though the branch also matched `v1.x` and `v*`
-  (which each have stricter permissions), any user that can push to this branch can also force push.
-
-## Require Code Owner approval on a protected branch
+### Require Code Owner approval
 
 {{< details >}}
 
@@ -439,7 +370,7 @@ In [GitLab Premium 13.5 and later](https://gitlab.com/gitlab-org/gitlab/-/issues
 who are allowed to push to protected branches do not need a merge request to merge their feature branches.
 Thus, they can skip merge request approval rules, Code Owners included.
 
-## Run pipelines on protected branches
+## CI/CD on protected branches
 
 The permission to merge or push to protected branches defines
 whether or not a user can run CI/CD pipelines and execute actions on jobs.
@@ -451,13 +382,13 @@ or push to the source branch.
 See [Security on protected branches](../../../../ci/pipelines/_index.md#pipeline-security-on-protected-branches)
 for details about the pipelines security model.
 
-## Create a new branch with protections
+## Create protected branches
 
 Prerequisites:
 
 - You must have at least the Developer role.
 - To create a protected branch, branch protection must be configured to
-  [require everyone to submit merge requests for a protected branch](#require-everyone-to-submit-merge-requests-for-a-protected-branch).
+  [require everyone to submit merge requests for a protected branch](#require-merge-requests).
 
 To create a new branch with protections:
 
@@ -465,14 +396,14 @@ To create a new branch with protections:
 1. Select **Code > Branches**.
 1. Select **New branch**.
 1. Fill in the branch name and select an existing branch, tag, or commit to
-   base the new branch on. If you [require everyone to submit merge requests for a protected branch](#require-everyone-to-submit-merge-requests-for-a-protected-branch), only existing protected branches and commits
+   base the new branch on. If you [require everyone to submit merge requests for a protected branch](#require-merge-requests), only existing protected branches and commits
    that are already in protected branches are accepted.
 
 You can also use [the Branches API](../../../../api/branches.md) to create a branch with protections.
 
-If branch protection is configured to [allow everyone to push directly to a protected branch](#allow-everyone-to-push-directly-to-a-protected-branch), a branch with protections can also be created from the command line or a Git client application.
+If branch protection is configured to [allow everyone to push directly to a protected branch](#allow-direct-push), a branch with protections can also be created from the command line or a Git client application.
 
-## Delete a protected branch
+## Delete protected branches
 
 Users with at least the Maintainer role can manually delete protected
 branches by using the GitLab web interface:
@@ -487,12 +418,13 @@ Protected branches can only be deleted by using GitLab either from the UI or API
 This prevents accidentally deleting a branch through local Git commands or
 third-party Git clients.
 
-## Merge request approval policies
+## Policy enforcement
 
 For security and compliance, you may implement a [merge request approval policy](../../../application_security/policies/merge_request_approval_policies.md#approval_settings) which affects settings otherwise defined in your instance, group, or projects. Policies may affect users ability to unprotect or delete branches, push or force push.
 
 ## Related topics
 
+- [Protection rules and permissions](protection_rules.md)
 - [Protected branches API](../../../../api/protected_branches.md)
 - [Branches](_index.md)
 - [Branches API](../../../../api/branches.md)
diff --git a/doc/user/project/repository/branches/protection_rules.md b/doc/user/project/repository/branches/protection_rules.md
new file mode 100644
index 00000000000..6a09d337ed8
--- /dev/null
+++ b/doc/user/project/repository/branches/protection_rules.md
@@ -0,0 +1,221 @@
+---
+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: How protection rules work with protected branches in GitLab, especially in complex scenarios.
+title: Protection rules and permissions
+---
+
+{{< details >}}
+
+- Tier: Free, Premium, Ultimate
+- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
+
+{{< /details >}}
+
+Protection rules control access to branches and determine what happens when multiple
+rules apply to the same branch. They help you implement the right security measures for your
+repository branches. These rules cover:
+
+- Permission levels, precedence, and rule conflicts.
+- Force push permissions across multiple matching rules.
+- Code Owner approvals.
+- Protection settings between groups and projects.
+
+## Push and merge permissions
+
+{{< history >}}
+
+- Branch push permission [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118532) to require GitLab administrators to also have the **allowed** permission in GitLab 16.0.
+
+{{< /history >}}
+
+When a branch is protected, the default behavior enforces these restrictions on the branch:
+
+| Action                   | Who can do it                           |
+|:-------------------------|:----------------------------------------|
+| Protect a branch         | At least the Maintainer role.           |
+| Push to the branch       | Anyone with **Allowed** permission. (1) |
+| Force push to the branch | No one.                                 |
+| Delete the branch        | No one. (2)                             |
+
+1. Users with the Developer role can create a project in a group, but might not be allowed to
+   initially push to the [default branch](default.md).
+1. No one can delete a protected branch using Git commands, however, users with at least Maintainer
+   role can [delete a protected branch](protected.md#delete-protected-branches) from the UI or API.
+
+### When a branch matches multiple rules
+
+When a branch matches multiple rules, the **most permissive rule** determines the
+level of protection for the branch. For example, consider these rules, which include
+[wildcards](protected.md#use-wildcard-rules):
+
+| Branch name pattern | Allowed to merge       | Allowed to push and merge |
+|---------------------|------------------------|---------------------------|
+| `v1.x`              | Maintainer             | Maintainer                |
+| `v1.*`              | Maintainer + Developer | Maintainer                |
+| `v*`                | No one                 | No one                    |
+
+A branch named `v1.x` is a case-sensitive match for all three branch name patterns: `v1.x`, `v1.*`, and `v*`.
+As the most permissive option determines the behavior, the resulting permissions for branch `v1.x` are:
+
+- **Allowed to merge:** Of the three settings, `Maintainer + Developer` is most permissive,
+  and controls branch behavior as a result. Even though the branch also matched `v1.x` and `v*`
+  (which each have stricter permissions), users with the Developer role can merge into the branch.
+- **Allowed to push and merge:** Of the three settings, `Maintainer` is the most permissive, and controls
+  branch behavior as a result. Even though branches matching `v*` are set to `No one`, branches
+  that _also_ match `v1.x` or `v1.*` receive the more permissive `Maintainer` permission.
+
+To be certain that a rule controls the behavior of a branch,
+_all_ other patterns that match must apply less or equally permissive rules.
+
+If you want to ensure that `No one` is allowed to push to branch `v1.x`, every pattern
+that matches `v1.x` must set `Allowed to push and merge` to `No one`, like this:
+
+| Branch name pattern | Allowed to merge       | Allowed to push and merge |
+|---------------------|------------------------|---------------------------|
+| `v1.x`              | Maintainer             | No one                    |
+| `v1.*`              | Maintainer + Developer | No one                    |
+| `v*`                | No one                 | No one                    |
+
+## Force push permissions
+
+When a branch matches multiple rules, the **most permissive rule** determines whether
+force push is allowed. For example, consider these rules, which include
+[wildcards](protected.md#use-wildcard-rules):
+
+| Branch name pattern | Allow force push |
+|---------------------|------------------|
+| `v1.x`              | Yes              |
+| `v1.*`              | No               |
+| `v*`                | No               |
+
+A branch named `v1.x` matches all three branch name patterns: `v1.x`, `v1.*`, and `v*`.
+As the most permissive option determines the behavior, the resulting permissions for branch `v1.x` are:
+
+- **Allow force push:** Of the three settings, `Yes` is most permissive,
+  and controls branch behavior as a result. Even though the branch also matched `v1.x` and `v*`
+  (which each have stricter permissions), any user that can push to this branch can also force push.
+
+## Code owner approvals
+
+{{< details >}}
+
+- Tier: Premium, Ultimate
+- Offering: GitLab.com, GitLab Self-Managed, GitLab Dedicated
+
+{{< /details >}}
+
+If a branch is protected by multiple rules, code owner approval is required if any of
+the applicable rules have **Required approval from code owners** enabled.
+
+For example, consider these rules:
+
+| Branch name pattern | Code owner approval required |
+|---------------------|------------------------------|
+| `v1.x`              | Yes                          |
+| `v1.*`              | No                           |
+| `v*`                | No                           |
+
+A branch named `v1.x` matches all three branch name patterns: `v1.x`, `v1.*`, and `v*`.
+Because at least one rule (`v1.x`) requires code owner approval, all merge requests to this branch
+require approval by a Code Owner before they can be merged.
+
+Unlike push, merge, and force push permissions (which use the most permissive rule),
+code owner approval uses the most restrictive rule. If any rule requires code owner approval,
+then all merge requests to matching branches require approval.
+
+## Rules across groups and projects
+
+Branch protection rules can be set in both groups and projects:
+
+- Group rules apply to all projects in a group and cannot be overridden.
+- Project rules apply only to that specific project.
+
+When both group and project rules exist that match a branch:
+
+1. Group rules always take precedence over project rules.
+1. If multiple group rules match a branch, the most permissive rule applies.
+1. If no group rules match but multiple project rules match, the most permissive project rule applies.
+
+For example, if a group owner set up a rule requiring Code Owner approval for the `main` branch,
+project maintainers cannot disable this requirement in the project.
+
+## Examples
+
+The following examples illustrate how protection rules work in practice.
+
+### Merge permission
+
+Assume you have these rules set up:
+
+| Branch name pattern | Allowed to merge                          |
+|---------------------|-------------------------------------------|
+| `development`       | Developers + Maintainers                  |
+| `dev*`              | Maintainers only                          |
+| `*`                 | No one                                    |
+
+With these rules:
+
+- For a branch named `development`: Developers and Maintainers can merge (from `development` rule).
+- For a branch named `dev-feature`: Maintainers can merge (from `dev*` rule).
+- For a branch named `feature`: No one can merge (from `*` rule).
+
+### Push permission
+
+Assume you have these rules set up:
+
+| Branch name pattern | Allowed to push and merge                  |
+|---------------------|-------------------------------------------|
+| `production`        | No one                                    |
+| `prod*`             | Maintainers only                          |
+| `*`                 | Developers + Maintainers                  |
+
+With these rules:
+
+- For a branch named `production`: No one can push (from `production` rule).
+- For a branch named `prod-release`: Maintainers can push (from `prod*` rule).
+- For a branch named `feature`: Developers and Maintainers can push (from `*` rule).
+
+### Direct push permission
+
+Assume you have these rules set up:
+
+| Branch name pattern | Allowed to merge        | Allowed to push and merge |
+|---------------------|-------------------------|---------------------------|
+| `main`              | Everyone with access    | No one                    |
+| `m*`                | Maintainers only        | Maintainers only          |
+
+With these rules:
+
+- For a branch named `main`:
+  - Everyone with access can create merge requests.
+  - No one can push directly (must use merge requests).
+- For a branch named `maintenance`:
+  - Only Maintainers can create merge requests.
+  - Only Maintainers can push directly.
+
+### Code owner approval
+
+Assume you have these rules set up:
+
+| Branch name pattern | Code owner approval required | Allowed to push and merge |
+|---------------------|------------------------------|---------------------------|
+| `release-*`         | Yes                          | Maintainers only          |
+| `rel*`              | No                           | Maintainers only          |
+
+With these rules:
+
+- For a branch named `release-1.0`:
+  - Code owner approval is required for merge requests.
+  - Only Maintainers can push directly.
+- For a branch named `relations-feature`:
+  - Code owner approval is not required.
+  - Only Maintainers can push directly.
+
+## Related topics
+
+- [Protected branches](protected.md)
+- [Protected branches API](../../../../api/protected_branches.md)
+- [Branch rules](branch_rules.md)
+- [Code Owners](../../codeowners/_index.md#code-owners-and-protected-branches)
diff --git a/doc/user/project/repository/mirror/troubleshooting.md b/doc/user/project/repository/mirror/troubleshooting.md
index 8991d1466cc..6478d1e5541 100644
--- a/doc/user/project/repository/mirror/troubleshooting.md
+++ b/doc/user/project/repository/mirror/troubleshooting.md
@@ -120,7 +120,7 @@ Pipelines might not run for multiple reasons:
   being added to the pipeline.
 - Pipelines are triggered using [the account that set up the pull mirror](https://gitlab.com/gitlab-org/gitlab/-/issues/13697).
   If the account is no longer valid, pipelines do not run.
-- [Branch protection](../branches/protected.md#run-pipelines-on-protected-branches)
+- [Branch protection](../branches/protected.md#cicd-on-protected-branches)
   might prevent the account that set up mirroring from running pipelines.
 
 ## `The repository is being updated`, but neither fails nor succeeds visibly
diff --git a/gems/gitlab-active-context/lib/active_context/databases/concerns/elastic_executor.rb b/gems/gitlab-active-context/lib/active_context/databases/concerns/elastic_executor.rb
index 469941fe431..dcc9e9364a5 100644
--- a/gems/gitlab-active-context/lib/active_context/databases/concerns/elastic_executor.rb
+++ b/gems/gitlab-active-context/lib/active_context/databases/concerns/elastic_executor.rb
@@ -12,7 +12,7 @@ module ActiveContext
           @raw_client ||= adapter.client.client
         end
 
-        def do_create_collection(name:, number_of_partitions:, fields:)
+        def do_create_collection(name:, number_of_partitions:, fields:, options: {})
           strategy = PartitionStrategy.new(
             name: name,
             number_of_partitions: number_of_partitions
@@ -23,18 +23,18 @@ module ActiveContext
 
           # Create missing partitions
           strategy.each_partition do |partition_name|
-            create_partition(partition_name, fields) unless index_exists?(partition_name)
+            create_partition(partition_name, fields, options) unless index_exists?(partition_name)
           end
 
           # Create alias if needed
           create_alias(strategy) unless alias_exists?(strategy.collection_name)
         end
 
-        def create_partition(name, fields)
+        def create_partition(name, fields, options = {})
           body = {
             mappings: {
               dynamic: 'strict',
-              properties: mappings(fields)
+              properties: mappings(fields, options)
             },
             settings: settings(fields)
           }
@@ -52,11 +52,17 @@ module ActiveContext
           raw_client.indices.update_aliases(body: { actions: actions })
         end
 
-        def mappings(fields)
-          build_field_mappings(fields).merge(
-            ref_id: { type: 'keyword' },
-            ref_version: { type: 'long' }
-          )
+        def mappings(fields, options = {})
+          field_mappings = build_field_mappings(fields)
+
+          if options.fetch(:include_ref_fields, true)
+            field_mappings.merge!(
+              ref_id: { type: 'keyword' },
+              ref_version: { type: 'long' }
+            )
+          end
+
+          field_mappings
         end
 
         def build_field_mappings(fields)
diff --git a/gems/gitlab-active-context/lib/active_context/databases/concerns/executor.rb b/gems/gitlab-active-context/lib/active_context/databases/concerns/executor.rb
index c6fd3948e98..09a9cf692a2 100644
--- a/gems/gitlab-active-context/lib/active_context/databases/concerns/executor.rb
+++ b/gems/gitlab-active-context/lib/active_context/databases/concerns/executor.rb
@@ -10,7 +10,7 @@ module ActiveContext
           @adapter = adapter
         end
 
-        def create_collection(name, number_of_partitions:, &block)
+        def create_collection(name, number_of_partitions:, options: {}, &block)
           builder = ActiveContext::Databases::CollectionBuilder.new
           yield(builder) if block
 
@@ -18,17 +18,21 @@ module ActiveContext
           do_create_collection(
             name: full_name,
             number_of_partitions: number_of_partitions,
-            fields: builder.fields
+            fields: builder.fields,
+            options: options
           )
 
-          create_collection_record(full_name, number_of_partitions)
+          create_collection_record(full_name, number_of_partitions, options)
         end
 
         private
 
-        def create_collection_record(name, number_of_partitions)
+        def create_collection_record(name, number_of_partitions, options)
           collection = adapter.connection.collections.find_or_initialize_by(name: name)
-          collection.update(number_of_partitions: number_of_partitions)
+          collection.update(
+            number_of_partitions: number_of_partitions,
+            include_ref_fields: options.fetch(:include_ref_fields, true)
+          )
           collection.save!
         end
 
diff --git a/gems/gitlab-active-context/lib/active_context/databases/postgresql/executor.rb b/gems/gitlab-active-context/lib/active_context/databases/postgresql/executor.rb
index f5ef4ac2bf4..acc2ab98149 100644
--- a/gems/gitlab-active-context/lib/active_context/databases/postgresql/executor.rb
+++ b/gems/gitlab-active-context/lib/active_context/databases/postgresql/executor.rb
@@ -6,9 +6,11 @@ module ActiveContext
       class Executor
         include ActiveContext::Databases::Concerns::Executor
 
+        RESERVED_FIELDS = %w[id partition_id ref_id ref_version].freeze
+
         private
 
-        def do_create_collection(name:, number_of_partitions:, fields:)
+        def do_create_collection(name:, number_of_partitions:, fields:, options: {})
           strategy = PartitionStrategy.new(
             name: name,
             number_of_partitions: number_of_partitions
@@ -17,7 +19,7 @@ module ActiveContext
           return if collection_exists?(strategy)
 
           # Create parent table if it doesn't exist
-          create_parent_table(strategy.collection_name, fields) unless table_exists?(strategy.collection_name)
+          create_parent_table(strategy.collection_name, fields, options) unless table_exists?(strategy.collection_name)
 
           # Create child partition tables
           strategy.each_partition do |partition_name|
@@ -34,7 +36,7 @@ module ActiveContext
           create_indices(strategy, fields)
         end
 
-        def create_parent_table(name, fields)
+        def create_parent_table(name, fields, options = {})
           fixed_columns, variable_columns = sort_fields_by_size(fields)
 
           adapter.client.with_connection do |connection|
@@ -50,10 +52,12 @@ module ActiveContext
 
               # Add id columns
               table.string :id, null: false
-              table.string :ref_id, null: false
 
-              # Add ref_version column
-              table.bigint :ref_version, null: false
+              # Add reference tracking columns if enabled
+              if options.fetch(:include_ref_fields, true)
+                table.string :ref_id, null: false
+                table.bigint :ref_version, null: false
+              end
 
               # Add variable width columns last
               variable_columns.each do |field|
@@ -91,6 +95,8 @@ module ActiveContext
         end
 
         def add_column_from_field(table, field)
+          return if RESERVED_FIELDS.include?(field.name.to_s)
+
           case field
           when Field::Bigint
             table.bigint(field.name, **field.options.except(:index))
diff --git a/gems/gitlab-active-context/lib/active_context/reference.rb b/gems/gitlab-active-context/lib/active_context/reference.rb
index 293ac35bff2..c047549819c 100644
--- a/gems/gitlab-active-context/lib/active_context/reference.rb
+++ b/gems/gitlab-active-context/lib/active_context/reference.rb
@@ -39,6 +39,7 @@ module ActiveContext
     end
 
     attr_reader :collection_id, :collection, :routing, :serialized_args, :ref_version
+    attr_accessor :include_ref_fields
     attr_writer :documents
 
     def initialize(collection_id:, routing:, args: [])
@@ -47,6 +48,7 @@ module ActiveContext
       @routing = routing
       @serialized_args = Array(args)
       @ref_version = Time.now.to_i
+      @include_ref_fields = collection.include_ref_fields
       init
     end
 
@@ -79,11 +81,16 @@ module ActiveContext
       end
 
       docs.map.with_index do |json, index|
-        json.merge(
-          unique_identifier: unique_identifier(index),
-          ref_id: identifier,
-          ref_version: ref_version
-        )
+        result = json.merge(unique_identifier: unique_identifier(index))
+
+        if include_ref_fields
+          result.merge!(
+            ref_id: identifier,
+            ref_version: ref_version
+          )
+        end
+
+        result
       end
     end
 
diff --git a/gems/gitlab-active-context/spec/lib/active_context/bulk_processor_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/bulk_processor_spec.rb
index 24ec2b02f7a..2dbda57282e 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/bulk_processor_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/bulk_processor_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ActiveContext::BulkProcessor do
   let(:reference_class) { Test::References::MockWithDatabaseRecord }
 
   let(:ref) { reference_class.new(collection_id: collection_id, routing: partition, args: 1) }
-  let(:mock_collection) { double(name: collection_name, partition_for: partition) }
+  let(:mock_collection) { double(name: collection_name, partition_for: partition, include_ref_fields: true) }
   let(:mock_object) { double(id: object_id) }
   let(:mock_relation) { double(find_by: mock_object) }
   let(:mock_connection) { double(id: connection_id) }
diff --git a/gems/gitlab-active-context/spec/lib/active_context/databases/concerns/executor_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/databases/concerns/executor_spec.rb
index 5f0a96a5e0d..0e182ab746a 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/databases/concerns/executor_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/databases/concerns/executor_spec.rb
@@ -53,9 +53,10 @@ RSpec.describe ActiveContext::Databases::Concerns::Executor do
       expect(executor).to receive(:do_create_collection).with(
         name: full_name,
         number_of_partitions: number_of_partitions,
-        fields: fields
+        fields: fields,
+        options: {}
       )
-      expect(executor).to receive(:create_collection_record).with(full_name, number_of_partitions)
+      expect(executor).to receive(:create_collection_record).with(full_name, number_of_partitions, {})
 
       executor.create_collection(name, number_of_partitions: number_of_partitions)
     end
@@ -79,10 +80,20 @@ RSpec.describe ActiveContext::Databases::Concerns::Executor do
 
     it 'creates or updates a collection record with the correct attributes' do
       expect(collections).to receive(:find_or_initialize_by).with(name: name).and_return(collection)
-      expect(collection).to receive(:update).with(number_of_partitions: number_of_partitions)
+      expect(collection).to receive(:update).with(number_of_partitions: number_of_partitions,
+        include_ref_fields: true)
       expect(collection).to receive(:save!)
 
-      executor.send(:create_collection_record, name, number_of_partitions)
+      executor.send(:create_collection_record, name, number_of_partitions, {})
+    end
+
+    it 'sets include_ref_fields if passed in' do
+      expect(collections).to receive(:find_or_initialize_by).with(name: name).and_return(collection)
+      expect(collection).to receive(:update).with(number_of_partitions: number_of_partitions,
+        include_ref_fields: false)
+      expect(collection).to receive(:save!)
+
+      executor.send(:create_collection_record, name, number_of_partitions, { include_ref_fields: false })
     end
   end
 
diff --git a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/chunking_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/chunking_spec.rb
index 308854b6502..fd6a357db13 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/chunking_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/chunking_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe ActiveContext::Preprocessors::Chunking do
   let(:reference_2) { reference_class.new(collection_id: 1, routing: 1, args: 1) }
   let(:references) { [reference_1, reference_2] }
 
-  let(:mock_collection) { double(name: collection_name, partition_for: partition) }
+  let(:mock_collection) { double(name: collection_name, partition_for: partition, include_ref_fields: true) }
   let(:mock_chunker) { double }
 
   let(:partition) { 2 }
diff --git a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/embeddings_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/embeddings_spec.rb
index 4a1644f0c19..9e0d4633039 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/embeddings_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/embeddings_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe ActiveContext::Preprocessors::Embeddings do
   let(:reference) { reference_class.new(collection_id: collection_id, routing: partition, args: object_id) }
 
   let(:mock_adapter) { double }
-  let(:mock_collection) { double(name: collection_name, partition_for: partition) }
+  let(:mock_collection) { double(name: collection_name, partition_for: partition, include_ref_fields: true) }
   let(:mock_object) { double(id: object_id) }
   let(:mock_relation) { double(find_by: mock_object) }
 
diff --git a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/preload_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/preload_spec.rb
index 1c8105bce36..2c951c402d5 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/preprocessors/preload_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/preprocessors/preload_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe ActiveContext::Preprocessors::Preload do
   let(:reference_2) { reference_class.new(collection_id: collection_id, routing: partition, args: object_id) }
 
   let(:mock_adapter) { double }
-  let(:mock_collection) { double(name: collection_name, partition_for: partition) }
+  let(:mock_collection) { double(name: collection_name, partition_for: partition, include_ref_fields: true) }
   let(:mock_object) { double(id: object_id) }
   let(:mock_relation) { double(find_by: mock_object) }
   let(:mock_connection) { double(id: connection_id) }
diff --git a/gems/gitlab-active-context/spec/lib/active_context/reference_spec.rb b/gems/gitlab-active-context/spec/lib/active_context/reference_spec.rb
index 48b67d2b6e8..a145e7308f5 100644
--- a/gems/gitlab-active-context/spec/lib/active_context/reference_spec.rb
+++ b/gems/gitlab-active-context/spec/lib/active_context/reference_spec.rb
@@ -64,10 +64,95 @@ RSpec.describe ActiveContext::Reference do
     end
   end
 
+  describe '#jsons' do
+    let(:reference_class) { Class.new(Test::References::Mock) }
+    let(:reference) { reference_class.new(collection_id: 1, routing: 2, args: 3) }
+    let(:mock_collection) { double(include_ref_fields: include_ref_fields) }
+    let(:include_ref_fields) { false }
+
+    before do
+      allow(ActiveContext::CollectionCache).to receive(:fetch).and_return(mock_collection)
+      allow(reference).to receive(:identifier).and_return('test-id')
+      allow(reference).to receive(:unique_identifier).with(0).and_return('test-id:0')
+      allow(reference).to receive(:unique_identifier).with(1).and_return('test-id:1')
+      reference.instance_variable_set(:@ref_version, 12345)
+    end
+
+    context 'when documents are already set' do
+      before do
+        reference.documents = [{ field1: 'value1' }, { field1: 'value2' }]
+      end
+
+      it 'uses the existing documents' do
+        expect(reference).not_to receive(:as_indexed_jsons)
+
+        result = reference.jsons
+        expect(result).to contain_exactly(
+          { field1: 'value1', unique_identifier: 'test-id:0' },
+          { field1: 'value2', unique_identifier: 'test-id:1' }
+        )
+      end
+    end
+
+    context 'when documents are not set' do
+      before do
+        allow(reference).to receive(:as_indexed_jsons).and_return([
+          { field1: 'value1' },
+          { field1: 'value2' }
+        ])
+      end
+
+      it 'calls as_indexed_jsons to get documents' do
+        expect(reference).to receive(:as_indexed_jsons)
+
+        result = reference.jsons
+        expect(result).to contain_exactly(
+          { field1: 'value1', unique_identifier: 'test-id:0' },
+          { field1: 'value2', unique_identifier: 'test-id:1' }
+        )
+      end
+    end
+
+    context 'when the class responds to shared_attributes' do
+      before do
+        reference.documents = [{ field1: 'value1' }, { field1: 'value2' }]
+        allow(reference).to receive(:shared_attributes).and_return({ shared_field: 'shared_value' })
+      end
+
+      it 'merges shared attributes with each document' do
+        result = reference.jsons
+        expect(result).to contain_exactly(
+          { field1: 'value1', shared_field: 'shared_value', unique_identifier: 'test-id:0' },
+          { field1: 'value2', shared_field: 'shared_value', unique_identifier: 'test-id:1' }
+        )
+      end
+    end
+
+    context 'when include_ref_fields is true' do
+      let(:include_ref_fields) { true }
+
+      before do
+        reference.documents = [{ field1: 'value1' }]
+      end
+
+      it 'adds ref_id and ref_version to each document' do
+        result = reference.jsons
+        expect(result).to contain_exactly(
+          {
+            field1: 'value1',
+            unique_identifier: 'test-id:0',
+            ref_id: 'test-id',
+            ref_version: 12345
+          }
+        )
+      end
+    end
+  end
+
   describe '#embedding_versions' do
     let(:reference_class) { Class.new(Test::References::Mock) }
     let(:reference) { reference_class.new(collection_id: 1, routing: 2, args: 3) }
-    let(:mock_collection) { double }
+    let(:mock_collection) { double(include_ref_fields: true) }
     let(:collection_class) { double }
     let(:current_embedding_versions) { [1, 2] }
 
diff --git a/keeps/initialize_big_int_conversion.rb b/keeps/initialize_big_int_conversion.rb
index 3d21afce570..68f67e612a8 100644
--- a/keeps/initialize_big_int_conversion.rb
+++ b/keeps/initialize_big_int_conversion.rb
@@ -237,7 +237,7 @@ module Keeps
     end
 
     def reset_db
-      ApplicationRecord.clear_all_connections!
+      ApplicationRecord.connection_handler.clear_all_connections!
       ::Gitlab::Housekeeper::Shell.execute('rails', 'db:reset', env: { 'RAILS_ENV' => 'test' })
     end
 
diff --git a/keeps/remove_duplicated_indexes.rb b/keeps/remove_duplicated_indexes.rb
index 78c5b61dc08..0ff60e2ce19 100644
--- a/keeps/remove_duplicated_indexes.rb
+++ b/keeps/remove_duplicated_indexes.rb
@@ -193,7 +193,7 @@ module Keeps
     end
 
     def reset_db
-      ApplicationRecord.clear_all_connections!
+      ApplicationRecord.connection_handler.clear_all_connections!
       ::Gitlab::Housekeeper::Shell.execute('rails', 'db:reset', env: { 'RAILS_ENV' => 'test' })
     end
 
diff --git a/lib/gitlab/database/reindexing.rb b/lib/gitlab/database/reindexing.rb
index 6f4b61821f6..388307bf09a 100644
--- a/lib/gitlab/database/reindexing.rb
+++ b/lib/gitlab/database/reindexing.rb
@@ -40,9 +40,6 @@ module Gitlab
 
           automatic_reindexing
         end
-
-        # Temporary in order to truncate this table during low traffic
-        TruncateTaggings.new.execute
       rescue StandardError => e
         Gitlab::AppLogger.error(e)
         raise
diff --git a/lib/gitlab/database/truncate_taggings.rb b/lib/gitlab/database/truncate_taggings.rb
deleted file mode 100644
index 356b1aea6ed..00000000000
--- a/lib/gitlab/database/truncate_taggings.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Database
-    class TruncateTaggings
-      include AsyncDdlExclusiveLeaseGuard
-
-      def execute
-        return unless Gitlab.com_except_jh? # rubocop:disable Gitlab/AvoidGitlabInstanceChecks -- it's not a feature
-        return unless taggings_has_any_data?
-
-        try_obtain_lease do
-          connection.execute('TRUNCATE TABLE "taggings"')
-        end
-      end
-
-      def taggings_has_any_data?
-        !!connection.select_value('SELECT TRUE FROM "taggings" LIMIT 1')
-      end
-
-      def connection
-        ::Ci::ApplicationRecord.connection
-      end
-
-      def connection_db_config
-        ::Ci::ApplicationRecord.connection_db_config
-      end
-
-      def lease_timeout
-        10.minutes
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/tracking/destinations/snowplow.rb b/lib/gitlab/tracking/destinations/snowplow.rb
index 774d459c173..094bcff431f 100644
--- a/lib/gitlab/tracking/destinations/snowplow.rb
+++ b/lib/gitlab/tracking/destinations/snowplow.rb
@@ -107,6 +107,10 @@ module Gitlab
           end
         end
 
+        def disable_product_usage_event_logging?
+          Gitlab::Utils.to_boolean(ENV['GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING'], default: false)
+        end
+
         def protocol
           'https'
         end
@@ -125,12 +129,22 @@ module Gitlab
         end
 
         def emitter
-          @emitter ||= SnowplowTracker::AsyncEmitter.new(
+          @emitter ||= emitter_class.new(
             endpoint: hostname,
             options: emitter_options
           )
         end
 
+        def emitter_class
+          # snowplow_enabled? is true for gitlab.com and customers that configured their own Snowplow collector
+          # In both bases we do not want to log the events being sent as the instance is controlled by the same company
+          # controlling the Snowplow collector.
+          return SnowplowTracker::AsyncEmitter if Gitlab::CurrentSettings.snowplow_enabled?
+          return SnowplowTracker::AsyncEmitter if disable_product_usage_event_logging?
+
+          SnowplowLoggingEmitter
+        end
+
         def emitter_options
           {
             protocol: protocol,
diff --git a/lib/gitlab/tracking/snowplow_event_logger.rb b/lib/gitlab/tracking/snowplow_event_logger.rb
new file mode 100644
index 00000000000..b842d932d5c
--- /dev/null
+++ b/lib/gitlab/tracking/snowplow_event_logger.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Tracking
+    class SnowplowEventLogger < Gitlab::JsonLogger
+      def self.file_name_noext
+        'product_usage_data'
+      end
+
+      def self.log_level
+        ::Logger::INFO
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/tracking/snowplow_logging_emitter.rb b/lib/gitlab/tracking/snowplow_logging_emitter.rb
new file mode 100644
index 00000000000..67f530de626
--- /dev/null
+++ b/lib/gitlab/tracking/snowplow_logging_emitter.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Tracking
+    class SnowplowLoggingEmitter < SnowplowTracker::AsyncEmitter
+      extend ::Gitlab::Utils::Override
+
+      override :send_requests
+      def send_requests(events)
+        events.each do |event|
+          event_logger.info(message: 'sending event', payload: event.to_json)
+        end
+
+        super
+      end
+
+      private
+
+      def event_logger
+        @event_logger ||= SnowplowEventLogger.build
+      end
+    end
+  end
+end
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index ffc9f7ecbb0..a24b7fa9d29 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -67,7 +67,7 @@ namespace :dev do
       end
 
       # Clear connections opened by this rake task too
-      ActiveRecord::Base.clear_all_connections! # rubocop:disable Database/MultipleDatabases
+      ActiveRecord::Base.connection_handler.clear_all_connections!
     end
   end
 
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index f26a59720a8..995944b865a 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -178,7 +178,7 @@ namespace :gitlab do
       database_name = ":#{database_name}" if database_name
       load_database = connection.tables.count <= 1
 
-      ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
+      ActiveRecord::Base.connection_handler.clear_all_connections!
 
       if load_database
         puts "Running db:schema:load#{database_name} rake task"
@@ -210,7 +210,7 @@ namespace :gitlab do
 
     desc "Clear all connections"
     task :clear_all_connections do
-      ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
+      ActiveRecord::Base.connection_handler.clear_all_connections!
     end
 
     ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5def4e6796b..e3c990c82f1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7158,6 +7158,9 @@ msgstr ""
 msgid "An error occurred while triggering the job."
 msgstr ""
 
+msgid "An error occurred while trying to enable GitLab Duo Core. Reload the page to try again."
+msgstr ""
+
 msgid "An error occurred while trying to follow this user, please try again."
 msgstr ""
 
diff --git a/package.json b/package.json
index 80b4bbe65af..98f7481f5a7 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
     "@rails/actioncable": "7.1.501",
     "@rails/ujs": "7.1.501",
-    "@sentry/browser": "9.13.0",
+    "@sentry/browser": "9.14.0",
     "@snowplow/browser-plugin-client-hints": "^3.24.2",
     "@snowplow/browser-plugin-form-tracking": "^3.24.2",
     "@snowplow/browser-plugin-ga-cookies": "^3.24.2",
diff --git a/qa/gdk/entrypoint b/qa/gdk/entrypoint
index e41eda56381..e1e4633b186 100755
--- a/qa/gdk/entrypoint
+++ b/qa/gdk/entrypoint
@@ -23,7 +23,7 @@ if [ -z "$CI" ]; then
 
   exec "$@" | tee -a ${HOME}/gitlab-development-kit/gitlab/log/gdk-container.log
 else
-  logs=("gitaly" "gitlab-workhorse" "postgresql" "rails-background-jobs" "redis" "sshd" "vite" "rails-web" "sidekiq-cron" "webpack" "gitlab-http-router")
+  logs=("gitaly" "gitlab-workhorse" "postgresql" "rails-background-jobs" "redis" "sshd" "vite" "rails-web" "sidekiq-cron" "webpack" "gitlab-http-router" "gitlab-topology-service")
   for log in "${logs[@]}"; do
     gdk tail $log &>${CI_BUILDS_DIR}/gdk.${log}.log &
   done
diff --git a/qa/gdk/gdk.yml b/qa/gdk/gdk.yml
index 188eeceb9f0..af8479bc550 100644
--- a/qa/gdk/gdk.yml
+++ b/qa/gdk/gdk.yml
@@ -45,8 +45,7 @@ prometheus:
 tracer:
   jaeger:
     enabled: false
-# https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/12503#note_2479345136
 gitlab_http_router:
-  enabled: false
+  enabled: true
 mise:
   enabled: true
diff --git a/scripts/product_usage_data_event_formatter.rb b/scripts/product_usage_data_event_formatter.rb
new file mode 100755
index 00000000000..5fa77693472
--- /dev/null
+++ b/scripts/product_usage_data_event_formatter.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+# Usage:
+#   scripts/product_usage_data_event_formatter.rb [file...]
+#
+# Examples:
+#   scripts/product_usage_data_event_formatter.rb log/product_usage_data.log
+#   cat log/product_usage_data.log | scripts/product_usage_data_event_formatter.rb
+#   tail -f log/product_usage_data.log | scripts/product_usage_data_event_formatter.rb
+#
+# Description:
+#   This script formats GitLab product usage data event logs for better readability.
+#   It pretty-prints the JSON and decodes the base64 encoded "cx" field in the payload.
+#   The script reads from files provided as arguments or from standard input.
+
+require 'json'
+require 'base64'
+
+ARGF.each_line do |line|
+  # Parse the outer JSON
+  data = JSON.parse(line.strip)
+
+  # Parse the payload JSON string
+  if data["payload"] && data["payload"].start_with?('{')
+    payload = JSON.parse(data["payload"])
+
+    # Decode the cx field if it exists
+    if payload["cx"]
+      begin
+        decoded_cx = JSON.parse(Base64.decode64(payload["cx"]))
+        payload["cx"] = decoded_cx
+      rescue StandardError
+        # Ignore the error and use the original value
+      end
+    end
+
+    # Replace the original payload with the parsed version
+    data["payload"] = payload
+  end
+
+  # Pretty print the result
+  puts JSON.pretty_generate(data)
+rescue StandardError => e
+  puts "Error processing line: #{e.message}"
+  puts line
+end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 66942039fc2..53ec018b122 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -865,26 +865,6 @@ RSpec.describe GroupsController, :with_current_organization, factory_default: :k
         expect(response).to have_gitlab_http_status(:ok)
       end
     end
-
-    context 'when request is JSON format' do
-      subject do
-        put :update, params: { id: group.to_param, group: { path: 'new_path' } }, format: :json
-      end
-
-      context 'when update service returns false' do
-        before do
-          allow_next_instance_of(::Groups::UpdateService) do |instance|
-            allow(instance).to receive(:execute).and_return(false)
-          end
-        end
-
-        it 'responds with :unprocess_entity' do
-          subject
-
-          expect(response).to have_gitlab_http_status(:unprocessable_entity)
-        end
-      end
-    end
   end
 
   context "updating :resource_access_token_creation_allowed" do
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index f4228cb353b..1321ec32aba 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -188,7 +188,6 @@ RSpec.describe 'Database schema',
       status_check_responses: %w[external_approval_rule_id],
       subscriptions: %w[user_id subscribable_id],
       suggestions: %w[commit_id],
-      taggings: %w[tag_id taggable_id tagger_id],
       timelogs: %w[user_id],
       todos: %w[target_id commit_id],
       uploads: %w[model_id organization_id namespace_id project_id],
diff --git a/spec/features/projects/graph_spec.rb b/spec/features/projects/graph_spec.rb
index a1438db3f5c..4fd28cc8830 100644
--- a/spec/features/projects/graph_spec.rb
+++ b/spec/features/projects/graph_spec.rb
@@ -94,28 +94,26 @@ RSpec.describe 'Project Graph', :js, feature_category: :source_code_management d
       project.enable_ci
     end
 
-    context 'with ci_improved_project_pipeline_analytics feature flag on' do
-      it 'renders Pipeline graphs' do
-        visit_path
+    it 'renders CI graphs' do
+      visit_path
 
-        expect(page).to have_content 'CI/CD Analytics'
-        expect(page).to have_content 'Pipelines'
-      end
+      expect(page).to have_content 'CI/CD Analytics'
+      expect(page).to have_content 'Last week'
+      expect(page).to have_content 'Last month'
+      expect(page).to have_content 'Last year'
+      expect(page).to have_content 'Pipeline durations for the last 30 commits'
     end
 
-    context 'with ci_improved_project_pipeline_analytics feature flag off' do
+    context 'when clickhouse is the data source', :click_house do
       before do
-        stub_feature_flags(ci_improved_project_pipeline_analytics: false)
+        allow(::Gitlab::ClickHouse).to receive(:enabled_for_analytics?).and_return(true)
       end
 
-      it 'renders CI graphs' do
-        visit_path
-
+      it 'renders Pipeline graphs' do
         expect(page).to have_content 'CI/CD Analytics'
-        expect(page).to have_content 'Last week'
-        expect(page).to have_content 'Last month'
-        expect(page).to have_content 'Last year'
-        expect(page).to have_content 'Pipeline durations for the last 30 commits'
+        expect(page).to have_content 'Total pipeline runs'
+        expect(page).to have_content 'Median duration'
+        expect(page).to have_content 'Success rate'
       end
     end
   end
diff --git a/spec/frontend/projects/pipelines/charts/components/app_spec.js b/spec/frontend/projects/pipelines/charts/components/app_spec.js
index ad9bfba1b19..0777fcefc56 100644
--- a/spec/frontend/projects/pipelines/charts/components/app_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/app_spec.js
@@ -12,9 +12,6 @@ describe('ProjectsPipelinesChartsApp', () => {
   const createWrapper = ({ provide, ...options } = {}) => {
     wrapper = shallowMount(App, {
       provide: {
-        glFeatures: {
-          ciImprovedProjectPipelineAnalytics: true,
-        },
         ...provide,
       },
       ...options,
@@ -62,20 +59,4 @@ describe('ProjectsPipelinesChartsApp', () => {
       expect(findPipelinesDashboard().exists()).toBe(false);
     });
   });
-
-  describe('ci_improved_project_pipeline_analytics feature flag', () => {
-    describe('when flag is disabled', () => {
-      it('renders component', () => {
-        createWrapper({
-          provide: {
-            glFeatures: {
-              ciImprovedProjectPipelineAnalytics: false,
-            },
-          },
-        });
-
-        expect(findPipelinesDashboard().exists()).toBe(true);
-      });
-    });
-  });
 });
diff --git a/spec/frontend/projects/pipelines/charts/components/clickhouse_help_popover_spec.js b/spec/frontend/projects/pipelines/charts/components/clickhouse_help_popover_spec.js
index 56640c72bbe..ee1401b07ae 100644
--- a/spec/frontend/projects/pipelines/charts/components/clickhouse_help_popover_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/clickhouse_help_popover_spec.js
@@ -6,14 +6,8 @@ import HelpPopover from '~/vue_shared/components/help_popover.vue';
 describe('DashboardHeader', () => {
   let wrapper;
 
-  const createComponent = ({ provide } = {}) => {
+  const createComponent = () => {
     wrapper = mount(ClickhouseHelpPopover, {
-      provide: {
-        glFeatures: {
-          ciImprovedProjectPipelineAnalytics: true,
-        },
-        ...provide,
-      },
       stubs: {
         HelpPopover,
       },
@@ -33,16 +27,4 @@ describe('DashboardHeader', () => {
       '/help/administration/analytics',
     );
   });
-
-  it('when ci_improved_project_pipeline_analytics is disabled, it is not rendered', () => {
-    createComponent({
-      provide: {
-        glFeatures: {
-          ciImprovedProjectPipelineAnalytics: false,
-        },
-      },
-    });
-
-    expect(findHelpPopover().exists()).toBe(false);
-  });
 });
diff --git a/spec/frontend/projects/settings/components/branch_rule_modal_spec.js b/spec/frontend/projects/settings/components/branch_rule_modal_spec.js
index 15e2b210ef5..afbc4f679d2 100644
--- a/spec/frontend/projects/settings/components/branch_rule_modal_spec.js
+++ b/spec/frontend/projects/settings/components/branch_rule_modal_spec.js
@@ -61,7 +61,7 @@ describe('BranchRuleModal', () => {
 
   it('renders help link', () => {
     expect(findHelpLink().attributes('href')).toBe(
-      '/help/user/project/repository/branches/protected#protect-multiple-branches-with-wildcard-rules',
+      '/help/user/project/repository/branches/protected#use-wildcard-rules',
     );
   });
 
diff --git a/spec/lib/gitlab/background_migration/copy_taggings_to_p_ci_build_tags_spec.rb b/spec/lib/gitlab/background_migration/copy_taggings_to_p_ci_build_tags_spec.rb
index a8cae8c63ae..c5e2da91841 100644
--- a/spec/lib/gitlab/background_migration/copy_taggings_to_p_ci_build_tags_spec.rb
+++ b/spec/lib/gitlab/background_migration/copy_taggings_to_p_ci_build_tags_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::BackgroundMigration::CopyTaggingsToPCiBuildTags, :suppress_partitioning_routing_analyzer,
-  feature_category: :continuous_integration do
+  feature_category: :continuous_integration, migration: :gitlab_ci do
   let(:ci_pipelines_table) { table(:ci_pipelines, database: :ci, primary_key: :id) }
   let(:ci_builds_table) { table(:p_ci_builds, database: :ci, primary_key: :id) }
   let(:ci_build_tags_table) { table(:p_ci_build_tags, database: :ci, primary_key: :id) }
diff --git a/spec/lib/gitlab/database/truncate_taggings_spec.rb b/spec/lib/gitlab/database/truncate_taggings_spec.rb
deleted file mode 100644
index e777ea16f93..00000000000
--- a/spec/lib/gitlab/database/truncate_taggings_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::Database::TruncateTaggings, feature_category: :database do
-  include MigrationsHelpers
-
-  before do
-    stub_feature_flags(disallow_database_ddl_feature_flags: false)
-  end
-
-  let(:taggings) { table(:taggings, database: :ci) }
-
-  describe '#execute' do
-    context 'when the table has data' do
-      before do
-        taggings.create!
-      end
-
-      context 'when executed on .com' do
-        before do
-          allow(Gitlab).to receive(:com_except_jh?).and_return(true)
-        end
-
-        it 'truncates taggings' do
-          recorder = ActiveRecord::QueryRecorder.new { described_class.new.execute }
-
-          expect(recorder.log).to include(/TRUNCATE TABLE "taggings"/)
-        end
-      end
-
-      it 'is a no-op everywhere else' do
-        recorder = ActiveRecord::QueryRecorder.new { described_class.new.execute }
-
-        expect(recorder.log).to be_empty
-      end
-    end
-
-    context 'when the table is empty' do
-      context 'when executed on .com' do
-        before do
-          allow(Gitlab).to receive(:com_except_jh?).and_return(true)
-        end
-
-        it 'does not truncate taggings' do
-          recorder = ActiveRecord::QueryRecorder.new { described_class.new.execute }
-
-          expect(recorder.log).not_to include(/TRUNCATE TABLE "taggings"/)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/tracking/destinations/snowplow_spec.rb b/spec/lib/gitlab/tracking/destinations/snowplow_spec.rb
index a35ab90d209..b51350f4032 100644
--- a/spec/lib/gitlab/tracking/destinations/snowplow_spec.rb
+++ b/spec/lib/gitlab/tracking/destinations/snowplow_spec.rb
@@ -315,4 +315,56 @@ RSpec.describe Gitlab::Tracking::Destinations::Snowplow, :do_not_stub_snowplow_b
       end
     end
   end
+
+  describe 'emitter class' do
+    context 'when snowplow is enabled' do
+      before do
+        stub_application_setting(snowplow_enabled?: true)
+      end
+
+      it 'uses AsyncEmitter' do
+        expect(SnowplowTracker::AsyncEmitter).to receive(:new)
+        expect(Gitlab::Tracking::SnowplowLoggingEmitter).not_to receive(:new)
+
+        subject.send(:emitter)
+      end
+    end
+
+    context 'when snowplow is disabled' do
+      before do
+        stub_application_setting(snowplow_enabled?: false)
+      end
+
+      context 'when GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING env variable is true' do
+        it 'uses AsyncEmitter' do
+          stub_env('GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING', '1')
+
+          expect(SnowplowTracker::AsyncEmitter).to receive(:new)
+          expect(Gitlab::Tracking::SnowplowLoggingEmitter).not_to receive(:new)
+
+          subject.send(:emitter)
+        end
+      end
+
+      context 'when GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING env variable is falsey' do
+        it 'uses SnowplowLoggingEmitter' do
+          stub_env('GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING', 'false')
+
+          expect(SnowplowTracker::AsyncEmitter).not_to receive(:new)
+          expect(Gitlab::Tracking::SnowplowLoggingEmitter).to receive(:new)
+
+          subject.send(:emitter)
+        end
+      end
+
+      context 'when GITLAB_DISABLE_PRODUCT_USAGE_EVENT_LOGGING env variable is not set' do
+        it 'uses SnowplowLoggingEmitter' do
+          expect(SnowplowTracker::AsyncEmitter).not_to receive(:new)
+          expect(Gitlab::Tracking::SnowplowLoggingEmitter).to receive(:new)
+
+          subject.send(:emitter)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/tracking/snowplow_logging_emitter_spec.rb b/spec/lib/gitlab/tracking/snowplow_logging_emitter_spec.rb
new file mode 100644
index 00000000000..5d3b87cafc7
--- /dev/null
+++ b/spec/lib/gitlab/tracking/snowplow_logging_emitter_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Tracking::SnowplowLoggingEmitter, feature_category: :service_ping do
+  let(:emitter) { described_class.new(endpoint: 'test.endpoint', options: { method: 'post' }) }
+
+  describe '#send_requests' do
+    it 'logs each event' do
+      stub = stub_request(:post, %r{/com.snowplowanalytics.snowplow/tp2})
+
+      event_logger = instance_double(Gitlab::Tracking::SnowplowEventLogger)
+      allow(Gitlab::Tracking::SnowplowEventLogger).to receive(:build).and_return(event_logger)
+      allow(event_logger).to receive(:info)
+
+      event1 = { event: 'event1' }
+      event2 = { event: 'event2' }
+      events = [event1, event2]
+
+      emitter.send_requests(events)
+
+      expect(event_logger).to have_received(:info).with(message: 'sending event', payload: '{"event":"event1"}')
+      expect(event_logger).to have_received(:info).with(message: 'sending event', payload: '{"event":"event2"}')
+
+      expect(stub).to have_been_requested
+    end
+  end
+end
diff --git a/spec/models/group_deploy_key_spec.rb b/spec/models/group_deploy_key_spec.rb
index 3480e72c226..c8a4a119de5 100644
--- a/spec/models/group_deploy_key_spec.rb
+++ b/spec/models/group_deploy_key_spec.rb
@@ -30,12 +30,6 @@ RSpec.describe GroupDeployKey do
     end
   end
 
-  describe '.defined_enums' do
-    it 'excludes the inherited enum' do
-      expect(described_class.defined_enums).to eq({})
-    end
-  end
-
   describe '#can_be_edited_for' do
     let_it_be(:user) { create(:user) }
 
diff --git a/spec/requests/projects/merge_requests/creations_controller_spec.rb b/spec/requests/projects/merge_requests/creations_controller_spec.rb
index 4be39182d76..dfb54a02d3b 100644
--- a/spec/requests/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/requests/projects/merge_requests/creations_controller_spec.rb
@@ -39,6 +39,15 @@ RSpec.describe 'Merge Request Creation', feature_category: :code_review_workflow
       end
     end
 
+    context 'when rapid_diffs_disabled param is present' do
+      it 'uses default action' do
+        get_diffs(rapid_diffs_disabled: true)
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response.body).to include('data-page="projects:merge_requests:creations:new"')
+      end
+    end
+
     it 'uses rapid diffs action' do
       get_diffs
 
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index 26c4d8b4190..c9fdbdffe26 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -4,7 +4,10 @@ require 'test_prof/before_all/adapters/active_record'
 
 module DbCleaner
   def all_connection_classes
-    ::TestProf::BeforeAll::Adapters::ActiveRecord.all_connections.map(&:connection_class).uniq
+    ::ActiveRecord::Base.connection_handler
+      .connection_pool_list(:writing)
+      .map { |pool| pool.connection.connection_class }
+      .uniq
   end
 
   def delete_from_all_tables!(except: [])
@@ -111,7 +114,7 @@ module DbCleaner
       connection.execute(cmd)
     end
 
-    ActiveRecord::Base.clear_all_connections! # rubocop:disable Database/MultipleDatabases
+    ActiveRecord::Base.connection_handler.clear_all_connections!
   end
 end
 
diff --git a/spec/tasks/dev_rake_spec.rb b/spec/tasks/dev_rake_spec.rb
index 7005357b3d6..5209c5ca22d 100644
--- a/spec/tasks/dev_rake_spec.rb
+++ b/spec/tasks/dev_rake_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe 'dev rake tasks' do
 
   describe 'terminate_all_connections' do
     before do
-      allow(ActiveRecord::Base).to receive(:clear_all_connections!)
+      allow(ActiveRecord::Base.connection_handler).to receive(:clear_all_connections!)
     end
 
     let(:connections) do
@@ -104,7 +104,7 @@ RSpec.describe 'dev rake tasks' do
     it 'terminates all connections' do
       expect_connections_to_be_terminated
 
-      expect(ActiveRecord::Base).to receive(:clear_all_connections!)
+      expect(ActiveRecord::Base.connection_handler).to receive(:clear_all_connections!)
 
       terminate_task
     end
@@ -113,7 +113,7 @@ RSpec.describe 'dev rake tasks' do
       it 'does not terminate connections' do
         expect(Rails.env).to receive(:production?).and_return(true)
         expect_connections_not_to_be_terminated
-        expect(ActiveRecord::Base).not_to receive(:clear_all_connections!)
+        expect(ActiveRecord::Base.connection_handler).not_to receive(:clear_all_connections!)
 
         terminate_task
       end
diff --git a/yarn.lock b/yarn.lock
index 854a0422b61..f10d0d21094 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2538,51 +2538,51 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@sentry-internal/browser-utils@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-9.13.0.tgz#886e6c1dcf706624d98166c389aadcbf9681bd71"
-  integrity sha512-uZcbwcGI49oPC/YDEConJ+3xi2mu0TsVsDiMQKb6JoSc33KH37wq2IwXJb9nakzKJXxyMNemb44r8irAswjItw==
+"@sentry-internal/browser-utils@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-9.14.0.tgz#d864b6c6c41fb409baa5df5080443f7c33bf7b86"
+  integrity sha512-pDk9XUu9zf7lcT9QX0nTObPNp/y0xQyy1Dj+5/8TSB3vAfe0LQcooKGl/D1h7EoIXVHUozZk5JC/dH+gz6BXRg==
   dependencies:
-    "@sentry/core" "9.13.0"
+    "@sentry/core" "9.14.0"
 
-"@sentry-internal/feedback@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-9.13.0.tgz#235bea4cd8c7dd4151725467a64b1c0f05b9788a"
-  integrity sha512-fOhMnhEbOR5QVPtn5Gc5+UKQHjvAN/LmtYE6Qya3w2FDh3ZlnIXNFJWqwOneuICV3kCWjN4lLckwmzzwychr7A==
+"@sentry-internal/feedback@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-9.14.0.tgz#d003ad6cddee140f7e82dbf649cf47e40489f6f9"
+  integrity sha512-D+PiEUWbDT0vqmaTiOs6OzXwVRVFgf7BCkFs48qsN9sAPwUgT+5zh2oo/rU2r0NrmMcvJVtSY+ezwPMk8BgGsg==
   dependencies:
-    "@sentry/core" "9.13.0"
+    "@sentry/core" "9.14.0"
 
-"@sentry-internal/replay-canvas@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-9.13.0.tgz#1821377b9587b61f080c8a21617ebdeef26b2580"
-  integrity sha512-5muW2BmEfWP1fpVWDNcIsph/WgqOqpHaXC1QMr4hk8/BWgt1/S2KPy85YiGVtM5lJJr0VhASKK8rBXG+9zm9IQ==
+"@sentry-internal/replay-canvas@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-9.14.0.tgz#30516c5555c6646401ea97540a459a064910b1c4"
+  integrity sha512-GhCSqc0oNzRiLhQsi9LCXgUmIwdHdvzVIsX4fihoFYWfgWSSj5YLqeEkb3CMM8htM6vheSFzIbPLlRS8fjCrPQ==
   dependencies:
-    "@sentry-internal/replay" "9.13.0"
-    "@sentry/core" "9.13.0"
+    "@sentry-internal/replay" "9.14.0"
+    "@sentry/core" "9.14.0"
 
-"@sentry-internal/replay@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-9.13.0.tgz#0266a5ff990f371f25154e85950d6a6e6da77c93"
-  integrity sha512-l+Atwab/bqI1N8+PSG1WWTCVmiOl7swL85Z9ntwS39QBnd66CTyzt/+j/n/UbAs8GienJK6FIfX1dvG1WmvUhA==
+"@sentry-internal/replay@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-9.14.0.tgz#491d12930175e814c097b9b6ba097f47b4f4770c"
+  integrity sha512-wgt397/PtpfVQ9t779a0L+hGH3JN9doXv3+9Wj98MLWwhymvJBjpjCFUBLScO5iP6imewTbRqQHbq7XS7I+x1A==
   dependencies:
-    "@sentry-internal/browser-utils" "9.13.0"
-    "@sentry/core" "9.13.0"
+    "@sentry-internal/browser-utils" "9.14.0"
+    "@sentry/core" "9.14.0"
 
-"@sentry/browser@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.13.0.tgz#76cf662656c7c7ddfd36081b6e8ba05c385fe823"
-  integrity sha512-KiC8s9/6HvdlfCRqA420YbiBiXMBif7GYESJ8VQqOKUmlPczn8V2CRrEZjMqxhlHdIGiR0PS6jb2VSgeJBchJQ==
+"@sentry/browser@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.14.0.tgz#159ca710028891e1e9b160d491ddfb774cf1ed67"
+  integrity sha512-acxFbFEei3hzKr/IW3OmkzHlwohRaRBG0872nIhLYV2f/BgZmR6eV5zrUoELMmt2cgoLmDYyfp1734OoplfDbw==
   dependencies:
-    "@sentry-internal/browser-utils" "9.13.0"
-    "@sentry-internal/feedback" "9.13.0"
-    "@sentry-internal/replay" "9.13.0"
-    "@sentry-internal/replay-canvas" "9.13.0"
-    "@sentry/core" "9.13.0"
+    "@sentry-internal/browser-utils" "9.14.0"
+    "@sentry-internal/feedback" "9.14.0"
+    "@sentry-internal/replay" "9.14.0"
+    "@sentry-internal/replay-canvas" "9.14.0"
+    "@sentry/core" "9.14.0"
 
-"@sentry/core@9.13.0":
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.13.0.tgz#3269cab4ba34fa0928f04936ddb82182069cb568"
-  integrity sha512-Zn1Qec5XNkNRE/M5QjL6YJLghETg6P188G/v2OzdHdHIRf0Y58/SnJilu3louF+ogos6kaSqqdMgzqKgZ8tCdg==
+"@sentry/core@9.14.0":
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.14.0.tgz#4d51bf0ff719a8dee821d31be4abf1afd73f6c6e"
+  integrity sha512-OLfucnP3LAL5bxVNWc2RVOHCX7fk9Er5bWPCS+O5cPjqNUUz0HQHhVh2Vhei5C0kYZZM4vy4BQit5T9LrlOaNA==
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"