From 6d61802bb77314c942b99e70011d9092281de4af Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 22 Jul 2025 21:16:37 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .eslint_todo/vue-no-unused-properties.mjs     |   2 -
 .gitlab/ci/rules.gitlab-ci.yml                |   9 +-
 .gitlab/ci/test-on-cng/main.gitlab-ci.yml     |   8 +
 Gemfile.lock                                  |   2 +-
 Gemfile.next.lock                             |   2 +-
 .../components/status_badge.vue               |   1 +
 .../components/assignees/assignee_avatar.vue  |  13 +-
 .../components/reviewers/reviewer_avatar.vue  |   8 +-
 .../components/create_work_item.vue           |  15 +-
 .../work_items/components/work_item_title.vue |  11 +-
 app/assets/stylesheets/framework/sidebar.scss |   2 +-
 .../packages/composer/package_finder.rb       |  35 +
 .../group_or_project_package_finder.rb        |   2 +
 app/models/ci/pipeline.rb                     |   8 +-
 app/models/merge_request.rb                   |   1 -
 .../coverage_report_worker.rb                 |   2 +-
 .../packages_composer_finder_refactor.yml     |  10 +
 config/feature_flags/wip/validity_refresh.yml |  10 +
 ...roject_id_to_merge_request_diff_commits.rb |   2 +-
 ...x_merge_request_diff_commits_project_id.rb |  16 +
 ...erge_requests_id_created_at_prepared_at.rb |  17 +
 db/schema_migrations/20250708034548           |   1 +
 db/schema_migrations/20250714085240           |   1 +
 db/structure.sql                              |   2 -
 doc/api/get_started/get_started_extending.md  |   2 +-
 doc/api/graphql/reference/_index.md           |   1 +
 doc/api/groups.md                             | 620 +++++++++---------
 doc/ci/_index.md                              |   2 +-
 doc/development/backend/ruby_style_guide.md   | 112 ++--
 .../event_definition_guide.md                 |   1 -
 doc/topics/git/get_started.md                 |   2 +-
 .../get-started-security.md                   |   2 +-
 .../get_started/get_started_deploy_release.md |   2 +-
 .../get_started/get_started_managing_code.md  |   2 +-
 .../get_started_managing_infrastructure.md    |   2 +-
 .../get_started/get_started_monitoring.md     |   2 +-
 .../get_started/get_started_planning_work.md  |   2 +-
 doc/user/get_started/get_started_projects.md  |   2 +-
 doc/user/get_started/get_started_runner.md    |   2 +-
 .../get_started/getting_started_gitlab_duo.md |   2 +-
 doc/user/gitlab_duo/context.md                |   2 +-
 doc/user/group/_index.md                      |   3 +-
 lib/api/composer_packages.rb                  |  25 +-
 locale/gitlab.pot                             |  12 +-
 package.json                                  |   2 +-
 qa/qa/tools/delete_resource_base.rb           |   4 +-
 qa/qa/tools/test_resources_handler.rb         |   9 +-
 spec/db/schema_spec.rb                        |   2 +-
 .../packages/composer/package_finder_spec.rb  |  54 ++
 .../assignees/assignee_avatar_spec.js         |   9 +-
 .../components/assignees/assignees_spec.js    |   4 -
 spec/models/ci/pipeline_spec.rb               |  28 +-
 spec/models/merge_request_spec.rb             |   8 -
 spec/requests/api/composer_packages_spec.rb   |  50 ++
 .../coverage_report_worker_spec.rb            |  16 +-
 yarn.lock                                     |   8 +-
 56 files changed, 705 insertions(+), 469 deletions(-)
 create mode 100644 app/finders/packages/composer/package_finder.rb
 create mode 100644 config/feature_flags/gitlab_com_derisk/packages_composer_finder_refactor.yml
 create mode 100644 config/feature_flags/wip/validity_refresh.yml
 create mode 100644 db/post_migrate/20250708034548_prepare_async_index_merge_request_diff_commits_project_id.rb
 create mode 100644 db/post_migrate/20250714085240_drop_index_merge_requests_id_created_at_prepared_at.rb
 create mode 100644 db/schema_migrations/20250708034548
 create mode 100644 db/schema_migrations/20250714085240
 create mode 100644 spec/finders/packages/composer/package_finder_spec.rb

diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs
index fefcf10d8f3..8a36574207f 100644
--- a/.eslint_todo/vue-no-unused-properties.mjs
+++ b/.eslint_todo/vue-no-unused-properties.mjs
@@ -96,7 +96,6 @@ export default {
     'app/assets/javascripts/jira_connect/branches/components/new_branch_form.vue',
     'app/assets/javascripts/jira_import/components/jira_import_form.vue',
     'app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue',
-    'app/assets/javascripts/merge_request_dashboard/components/status_badge.vue',
     'app/assets/javascripts/ml/experiment_tracking/components/candidate_list.vue',
     'app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue',
     'app/assets/javascripts/ml/experiment_tracking/routes/candidates/promote/model_selection_dropdown.vue',
@@ -219,7 +218,6 @@ export default {
     'ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue',
     'ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue',
     'ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_table.vue',
-    'ee/app/assets/javascripts/audit_events/components/stream/stream_delete_modal.vue',
     'ee/app/assets/javascripts/billings/components/zuora_simple.vue',
     'ee/app/assets/javascripts/billings/subscriptions/components/subscription_table.vue',
     'ee/app/assets/javascripts/ci/merge_trains/components/merge_trains_table.vue',
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 255661f5861..1b02ae2da48 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1153,6 +1153,9 @@
 .build-images:rules:build-gdk-image:
   rules:
     - !reference [".qa:rules:e2e-test-never-run", rules]
+    # E2E tests are already executed against cng deployment so gdk is skipped
+    - <<: *if-merge-request-targeting-stable-branch
+      when: never
     - <<: *if-default-branch-schedule-nightly  # already executed in the 2-hourly schedule
       when: never
     - <<: *if-dot-com-gitlab-org-schedule
@@ -2019,6 +2022,9 @@
       when: never
     - <<: *if-default-branch-schedule-nightly  # already executed in the 2-hourly schedule
       when: never
+    # Full suite is already executed against cng deployment which is a proper release environment
+    - <<: *if-merge-request-targeting-stable-branch
+      when: never
     - !reference [".qa:rules:e2e-blocking-base-before", rules]
     # Run tests automatically for MRs that touch Ruby version files
     - <<: *if-merge-request
@@ -2038,9 +2044,6 @@
 
 .qa:rules:e2e:test-on-cng:
   rules:
-    # TODO: Enable for stable branches once cng is fully enabled in mr pipelines
-    - <<: *if-merge-request-targeting-stable-branch
-      when: never
     # TODO: Check security fork is able to build cng images before enabling
     - <<: *if-security-merge-request
       when: never
diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml
index 9389e131db0..4984358767b 100644
--- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml
+++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml
@@ -115,6 +115,14 @@ build-cng-env:
     CNG_ACCESS_TOKEN: $CNG_MIRROR_ACCESS_TOKEN
     CNG_SKIP_REDUNDANT_JOBS: "true"
     GIT_STRATEGY: none
+  # when running in backport, override CNG_COMMIT so it defaults to release branch instead
+  # this ensures images are built using same stable release branch in CNG repository
+  # this is needed in case CNG repository backports some fixes related to specific release
+  rules:
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/
+      variables:
+        CNG_COMMIT_SHA: ''
+    - when: always
 
 build-cng:
   stage: .pre
diff --git a/Gemfile.lock b/Gemfile.lock
index 00b354b1006..de9b4347470 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2420,4 +2420,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.5
+   2.7.1
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 6ef02328728..f866f3c2f89 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -2415,4 +2415,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.5
+   2.7.1
diff --git a/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue b/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue
index 7cd74b47739..0f67b663dfb 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue
@@ -26,6 +26,7 @@ export default {
     currentUserId() {
       return convertToGraphQLId(TYPENAME_USER, gon.current_user_id);
     },
+    // eslint-disable-next-line vue/no-unused-properties -- currentUserAsReviewer is accessed by badge methods when 'this' component instance is passed to them.
     currentUserAsReviewer() {
       return this.mergeRequest.reviewers.nodes.find((r) => r.id === this.currentUserId);
     },
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue
index 69d19b54e7b..79f49f1f3aa 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlAvatar, GlIcon } from '@gitlab/ui';
 import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
-import { __, sprintf } from '~/locale';
 
 export default {
   components: {
@@ -24,9 +23,6 @@ export default {
     },
   },
   computed: {
-    assigneeAlt() {
-      return sprintf(__("%{userName}'s avatar"), { userName: this.user.name });
-    },
     avatarUrl() {
       return (
         this.user.avatarUrl || this.user.avatar || this.user.avatar_url || gon.default_avatar_url
@@ -49,9 +45,14 @@ export default {
       :label="user.name"
       :src="avatarUrl"
       :size="imgSize"
-      :alt="assigneeAlt"
+      aria-hidden="true"
       data-testid="avatar-image"
     />
-    <gl-icon v-if="hasMergeIcon" name="warning-solid" aria-hidden="true" class="merge-icon" />
+    <gl-icon
+      v-if="hasMergeIcon"
+      :aria-label="__('Cannot merge')"
+      name="warning-solid"
+      class="merge-icon"
+    />
   </span>
 </template>
diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue
index 39e37591a79..456c819fb25 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar.vue
@@ -2,7 +2,6 @@
 // NOTE! For the first iteration, we are simply copying the implementation of Assignees
 // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736
 import { GlAvatar, GlIcon } from '@gitlab/ui';
-import { __, sprintf } from '~/locale';
 
 export default {
   components: {
@@ -20,9 +19,6 @@ export default {
     },
   },
   computed: {
-    reviewerAlt() {
-      return sprintf(__("%{userName}'s avatar"), { userName: this.user.name });
-    },
     avatarUrl() {
       return this.user.avatarUrl || this.user.avatar_url || gon.default_avatar_url;
     },
@@ -35,11 +31,11 @@ export default {
 
 <template>
   <span class="gl-relative">
-    <gl-avatar :label="user.name" :src="avatarUrl" :size="imgSize" :alt="reviewerAlt" />
+    <gl-avatar :label="user.name" :src="avatarUrl" :size="imgSize" aria-hidden="true" />
     <gl-icon
       v-if="hasMergeIcon"
+      :aria-label="__('Cannot merge')"
       name="warning-solid"
-      aria-hidden="true"
       class="merge-icon reviewer-merge-icon"
     />
   </span>
diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue
index 6288367cf91..e15a6896aff 100644
--- a/app/assets/javascripts/work_items/components/create_work_item.vue
+++ b/app/assets/javascripts/work_items/components/create_work_item.vue
@@ -68,6 +68,7 @@ import {
   WORK_ITEM_TYPE_NAME_ISSUE,
   WIDGET_TYPE_STATUS,
 } from '../constants';
+import { TITLE_LENGTH_MAX } from '../../issues/constants';
 import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql';
 import namespaceWorkItemTypesQuery from '../graphql/namespace_work_item_types.query.graphql';
 import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql';
@@ -659,6 +660,15 @@ export default {
     this.setNumberOfDiscussionsResolved();
     addShortcutsExtension(ShortcutsWorkItems);
     new ZenMode(); // eslint-disable-line no-new
+
+    // Set focus on title field
+    this.$nextTick(async () => {
+      await new Promise((resolve) => {
+        setTimeout(resolve, 250);
+      });
+
+      this.$refs.title?.focusInput?.();
+    });
   },
   beforeDestroy() {
     document.removeEventListener('keydown', this.handleKeydown);
@@ -692,7 +702,9 @@ export default {
       return widgetDefinitions.indexOf(widgetType) !== -1;
     },
     validate() {
-      this.isTitleValid = Boolean(String(this.workItemTitle).trim());
+      this.isTitleValid =
+        Boolean(String(this.workItemTitle).trim()) &&
+        String(this.workItemTitle).trim().length <= TITLE_LENGTH_MAX;
     },
     setNumberOfDiscussionsResolved() {
       if (this.discussionToResolve || this.mergeRequestToResolveDiscussionsOf) {
@@ -739,6 +751,7 @@ export default {
     async updateDraftData(type, value) {
       if (type === 'title') {
         this.localTitle = value;
+        this.validate();
       }
 
       try {
diff --git a/app/assets/javascripts/work_items/components/work_item_title.vue b/app/assets/javascripts/work_items/components/work_item_title.vue
index 19d8c3e965c..4ce898455ab 100644
--- a/app/assets/javascripts/work_items/components/work_item_title.vue
+++ b/app/assets/javascripts/work_items/components/work_item_title.vue
@@ -50,14 +50,11 @@ export default {
     };
   },
   computed: {
-    isTitleValid() {
-      return this.workItemTitle.length <= TITLE_LENGTH_MAX;
-    },
     workItemTitle() {
       return this.titleHtml || this.title;
     },
     invalidFeedback() {
-      return this.isTitleValid ? this.$options.i18n.requiredFieldFeedback : '';
+      return this.workItemTitle ? '' : this.$options.i18n.requiredFieldFeedback;
     },
   },
   methods: {
@@ -66,7 +63,11 @@ export default {
     },
     emitField($event) {
       this.$emit('updateDraft', $event);
-      this.$emit('isTitleValid', this.isTitleValid);
+    },
+    // Used in ./create_work_item.vue
+    // eslint-disable-next-line vue/no-unused-properties
+    focusInput() {
+      this.$refs.workitemTitleField.focus();
     },
   },
   TITLE_LENGTH_MAX,
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 5dfe905a8bd..12c47dc5561 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -762,7 +762,7 @@
   position: absolute;
   bottom: -3px;
   right: -3px;
-  filter: drop-shadow(0 0 0.5px $white) drop-shadow(0 0 1px $white) drop-shadow(0 0 2px $white);
+  filter: drop-shadow(0 0 0.5px var(--gl-shadow-color-default)) drop-shadow(0 0 1px var(--gl-shadow-color-default)) drop-shadow(0 0 2px var(--gl-shadow-color-default));
 }
 
 .sidebar-help-wrap {
diff --git a/app/finders/packages/composer/package_finder.rb b/app/finders/packages/composer/package_finder.rb
new file mode 100644
index 00000000000..b5cf552a147
--- /dev/null
+++ b/app/finders/packages/composer/package_finder.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Packages
+  module Composer
+    class PackageFinder < ::Packages::GroupOrProjectPackageFinder
+      extend ::Gitlab::Utils::Override
+
+      def execute
+        packages.preload_composer
+      end
+
+      private
+
+      def packages
+        results = filter_by_exact_package_name(base)
+        results = results.with_composer_target(params[:target_sha]) if params[:target_sha]
+        results
+      end
+
+      override :group_packages
+      def group_packages
+        packages_visible_to_user(
+          @current_user,
+          within_group: @project_or_group,
+          with_package_registry_enabled: true
+        )
+      end
+
+      override :packages_class
+      def packages_class
+        ::Packages::Composer::Package
+      end
+    end
+  end
+end
diff --git a/app/finders/packages/group_or_project_package_finder.rb b/app/finders/packages/group_or_project_package_finder.rb
index d1a8dfd9231..bc0e341b01e 100644
--- a/app/finders/packages/group_or_project_package_finder.rb
+++ b/app/finders/packages/group_or_project_package_finder.rb
@@ -20,6 +20,8 @@ module Packages
 
     private
 
+    attr_reader :params
+
     def packages
       raise NotImplementedError
     end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 2cfc24d2c9b..1d7bfd91d3c 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -350,10 +350,9 @@ module Ci
         end
       end
 
-      after_transition any => ::Ci::Pipeline.completed_statuses do |pipeline|
+      after_transition any => ::Ci::Pipeline.completed_with_manual_statuses do |pipeline|
         pipeline.run_after_commit do
           ::Ci::PipelineArtifacts::CoverageReportWorker.perform_async(pipeline.id)
-          ::Ci::PipelineArtifacts::CreateQualityReportWorker.perform_async(pipeline.id)
         end
       end
 
@@ -367,6 +366,7 @@ module Ci
 
       after_transition any => ::Ci::Pipeline.completed_statuses do |pipeline|
         pipeline.run_after_commit do
+          ::Ci::PipelineArtifacts::CreateQualityReportWorker.perform_async(pipeline.id)
           ::Ci::TestFailureHistoryService.new(pipeline).async.perform_if_needed # rubocop: disable CodeReuse/ServiceClass
         end
       end
@@ -1100,10 +1100,6 @@ module Ci
       object_hierarchy(project_condition: :same).descendants
     end
 
-    def self_and_project_descendants_complete?
-      self_and_project_descendants.all?(&:complete?)
-    end
-
     # Follow the parent-child relationships and return the top-level parent
     def root_ancestor
       return self unless child?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7db4cdb5802..20478431bb3 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -421,7 +421,6 @@ class MergeRequest < ApplicationRecord
   }
 
   scope :with_csv_entity_associations, -> { preload(:assignees, :approved_by_users, :author, :milestone, metrics: [:merged_by]) }
-  scope :recently_unprepared, -> { where(prepared_at: nil).where(created_at: 2.hours.ago..).order(:created_at, :id) } # id is the tie-breaker
 
   scope :by_target_branch_wildcard, ->(wildcard_branch_name) do
     where("target_branch LIKE ?", ApplicationRecord.sanitize_sql_like(wildcard_branch_name).tr('*', '%'))
diff --git a/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb b/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
index e077d2ddfee..124386e115d 100644
--- a/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
@@ -21,7 +21,7 @@ module Ci
         return unless pipeline
 
         pipeline.root_ancestor.try do |root_ancestor_pipeline|
-          next unless root_ancestor_pipeline.self_and_project_descendants_complete?
+          next if root_ancestor_pipeline.self_and_project_descendants.alive.any?
 
           Ci::PipelineArtifacts::CoverageReportService.new(root_ancestor_pipeline).execute
         end
diff --git a/config/feature_flags/gitlab_com_derisk/packages_composer_finder_refactor.yml b/config/feature_flags/gitlab_com_derisk/packages_composer_finder_refactor.yml
new file mode 100644
index 00000000000..32a54f64930
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/packages_composer_finder_refactor.yml
@@ -0,0 +1,10 @@
+---
+name: packages_composer_finder_refactor
+description: Refactor composer packages finder
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/548761
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196521
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/553346
+milestone: '18.3'
+group: group::package registry
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/wip/validity_refresh.yml b/config/feature_flags/wip/validity_refresh.yml
new file mode 100644
index 00000000000..a6997a7350d
--- /dev/null
+++ b/config/feature_flags/wip/validity_refresh.yml
@@ -0,0 +1,10 @@
+---
+name: validity_refresh
+description:
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/555411
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/198161
+rollout_issue_url:
+milestone: '18.3'
+group: group::secret detection
+type: wip
+default_enabled: false
diff --git a/db/migrate/20250707185423_add_project_id_to_merge_request_diff_commits.rb b/db/migrate/20250707185423_add_project_id_to_merge_request_diff_commits.rb
index ce4213ce094..da08f3ad251 100644
--- a/db/migrate/20250707185423_add_project_id_to_merge_request_diff_commits.rb
+++ b/db/migrate/20250707185423_add_project_id_to_merge_request_diff_commits.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddProjectIdToMergeRequestDiffCommits < Gitlab::Database::Migration[2.3]
-  milestone '18.2'
+  milestone '18.3'
 
   def change
     add_column :merge_request_diff_commits, :project_id, :bigint # rubocop:disable Migration/PreventAddingColumns -- Needed for future partitioning and sharding
diff --git a/db/post_migrate/20250708034548_prepare_async_index_merge_request_diff_commits_project_id.rb b/db/post_migrate/20250708034548_prepare_async_index_merge_request_diff_commits_project_id.rb
new file mode 100644
index 00000000000..0edc43af829
--- /dev/null
+++ b/db/post_migrate/20250708034548_prepare_async_index_merge_request_diff_commits_project_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class PrepareAsyncIndexMergeRequestDiffCommitsProjectId < Gitlab::Database::Migration[2.3]
+  milestone '18.3'
+
+  INDEX_NAME = 'index_merge_request_diff_commits_on_project_id'
+
+  # TODO: Index to be created synchronously in https://gitlab.com/gitlab-org/gitlab/-/issues/554107
+  def up
+    prepare_async_index :merge_request_diff_commits, :project_id, name: INDEX_NAME # rubocop:disable Migration/PreventIndexCreation -- Need while reading from the old table before the new one is swapped
+  end
+
+  def down
+    unprepare_async_index :merge_request_diff_commits, :project_id, name: INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250714085240_drop_index_merge_requests_id_created_at_prepared_at.rb b/db/post_migrate/20250714085240_drop_index_merge_requests_id_created_at_prepared_at.rb
new file mode 100644
index 00000000000..f9e700cffae
--- /dev/null
+++ b/db/post_migrate/20250714085240_drop_index_merge_requests_id_created_at_prepared_at.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropIndexMergeRequestsIdCreatedAtPreparedAt < Gitlab::Database::Migration[2.3]
+  disable_ddl_transaction!
+  milestone '18.3'
+
+  TABLE_NAME = :merge_requests
+  INDEX_NAME = :index_merge_requests_id_created_at_prepared_at
+
+  def up
+    remove_concurrent_index_by_name TABLE_NAME, name: INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index TABLE_NAME, [:created_at, :id], name: INDEX_NAME, where: 'prepared_at IS NULL'
+  end
+end
diff --git a/db/schema_migrations/20250708034548 b/db/schema_migrations/20250708034548
new file mode 100644
index 00000000000..85a4feec421
--- /dev/null
+++ b/db/schema_migrations/20250708034548
@@ -0,0 +1 @@
+20c156867e7785b9ffa1dce7e574117f1a09235aa5b206bd3fd682d285968367
\ No newline at end of file
diff --git a/db/schema_migrations/20250714085240 b/db/schema_migrations/20250714085240
new file mode 100644
index 00000000000..947f880fc22
--- /dev/null
+++ b/db/schema_migrations/20250714085240
@@ -0,0 +1 @@
+c0255dc1b528edb51bedf860349894029e9471ef8f5782fcfb4703f008bf4a1a
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index cf46d8c5a6a..5bde1f735c1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -36725,8 +36725,6 @@ CREATE UNIQUE INDEX index_merge_requests_compliance_violations_unique_columns ON
 
 CREATE INDEX index_merge_requests_for_latest_diffs_with_state_merged ON merge_requests USING btree (latest_merge_request_diff_id, target_project_id) WHERE (state_id = 3);
 
-CREATE INDEX index_merge_requests_id_created_at_prepared_at ON merge_requests USING btree (created_at, id) WHERE (prepared_at IS NULL);
-
 CREATE INDEX index_merge_requests_on_assignee_id ON merge_requests USING btree (assignee_id);
 
 CREATE INDEX index_merge_requests_on_author_id_and_created_at ON merge_requests USING btree (author_id, created_at);
diff --git a/doc/api/get_started/get_started_extending.md b/doc/api/get_started/get_started_extending.md
index c2196806a8c..55ff93fe0bb 100644
--- a/doc/api/get_started/get_started_extending.md
+++ b/doc/api/get_started/get_started_extending.md
@@ -2,7 +2,7 @@
 stage: none
 group: none
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to interact programmatically with GitLab.
+description: Interact programmatically with GitLab.
 title: Get started extending GitLab
 ---
 
diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md
index 58fd99cdf94..dabc9d9e1f6 100644
--- a/doc/api/graphql/reference/_index.md
+++ b/doc/api/graphql/reference/_index.md
@@ -45034,6 +45034,7 @@ AI features that can be configured through the Duo self-hosted feature settings.
 | ----- | ----------- |
 | <a id="aifeaturescode_completions"></a>`CODE_COMPLETIONS` | Code completion feature setting. |
 | <a id="aifeaturescode_generations"></a>`CODE_GENERATIONS` | Code generation feature setting. |
+| <a id="aifeaturesduo_agent_platform"></a>`DUO_AGENT_PLATFORM` | Duo agent platform feature setting. |
 | <a id="aifeaturesduo_chat"></a>`DUO_CHAT` | Duo Chat feature setting. |
 | <a id="aifeaturesduo_chat_explain_code"></a>`DUO_CHAT_EXPLAIN_CODE` | Duo chat explain code feature setting. |
 | <a id="aifeaturesduo_chat_explain_vulnerability"></a>`DUO_CHAT_EXPLAIN_VULNERABILITY` | Duo chat explain vulnerability feature setting. |
diff --git a/doc/api/groups.md b/doc/api/groups.md
index 548a1ac1440..11e120d9ed3 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -21,7 +21,7 @@ Endpoint responses might vary based on the [permissions](../user/permissions.md)
 Get all details of a group. This endpoint can be accessed without authentication
 if the group is publicly accessible. In case the user that requests is an administrator
 if the group is publicly accessible. With authentication, it returns the `runners_token` and `enabled_git_access_protocol`
-for the group too, if the user is an administrator or group owner.
+for the group too, if the user is an administrator or has the Owner role.
 
 ```plaintext
 GET /groups/:id
@@ -280,8 +280,6 @@ Example response:
 
 ## List groups
 
-List groups.
-
 ### List all groups
 
 Get a list of visible groups for the authenticated user. When accessed without
@@ -298,18 +296,18 @@ Parameters:
 
 | Attribute                | Type              | Required | Description |
 |--------------------------|-------------------|----------|-------------|
-| `skip_groups`            | array of integers | no       | Skip the group IDs passed |
+| `skip_groups`            | array of integers | no       | Skip the group IDs passed. |
 | `all_available`          | boolean           | no       | When `true`, returns all accessible groups. When `false`, returns only groups where the user is a member. Defaults to `false` for users, `true` for administrators. Unauthenticated requests always return all public groups. The `owned` and `min_access_level` attributes take precedence. |
-| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria |
-| `order_by`               | string            | no       | Order groups by `name`, `path`, `id`, or `similarity`. Default is `name` |
-| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc` |
-| `statistics`             | boolean           | no       | Include group statistics (administrators only).<br>*Note:* For top-level groups, the response returns the full `root_storage_statistics` data displayed in the UI. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/469254) in GitLab 17.4. |
+| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria. |
+| `order_by`               | string            | no       | Order groups by `name`, `path`, `id`, or `similarity`. Default is `name`. |
+| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc`. |
+| `statistics`             | boolean           | no       | Include group statistics (administrators only).<br> For top-level groups, the response returns the full `root_storage_statistics` data displayed in the UI. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/469254) in GitLab 17.4. |
 | `visibility`             | string            | no       | Limit to groups with `public`, `internal`, or `private` visibility. |
-| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
-| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user |
-| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles) |
-| `top_level_only`         | boolean           | no       | Limit to top-level groups, excluding all subgroups |
-| `repository_storage`     | string            | no       | Filter by repository storage used by the group _(administrators only)_. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/419643) in GitLab 16.3. Premium and Ultimate only. |
+| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
+| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user. |
+| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles). |
+| `top_level_only`         | boolean           | no       | Limit to top-level groups, excluding all subgroups. |
+| `repository_storage`     | string            | no       | Filter by repository storage used by the group (administrators only). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/419643) in GitLab 16.3. Premium and Ultimate only. |
 | `marked_for_deletion_on` | date              | no       | Filter by date when group was marked for deletion. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/429315) in GitLab 17.1. Premium and Ultimate only. |
 | `active`                 | boolean           | no       | Limit by groups that are not archived and not marked for deletion. |
 | `archived`               | boolean           | no       | Limit by groups that are archived. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/519587) in GitLab 18.2. This parameter is an experiment. |
@@ -468,9 +466,9 @@ You can filter by [custom attributes](custom_attributes.md) with:
 GET /groups?custom_attributes[key]=value&custom_attributes[other_key]=other_value
 ```
 
-#### Namespaces in groups
+#### Group pagination
 
-By default, groups only get 20 namespaces at a time because the API results are paginated.
+By default, only 20 groups are displayed at a time because the API results are paginated.
 
 To get more (up to 100), pass the following as an argument to the API call:
 
@@ -505,8 +503,6 @@ GET /groups?search=foobar
 
 ## List group details
 
-List details of the group.
-
 ### List projects
 
 Get a list of projects in this group. When accessed without authentication, only public projects are returned.
@@ -521,22 +517,22 @@ Parameters:
 
 | Attribute                     | Type           | Required | Description |
 |-------------------------------|----------------|----------|-------------|
-| `id`                          | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `archived`                    | boolean        | no       | Limit by archived status |
-| `visibility`                  | string         | no       | Limit by visibility `public`, `internal`, or `private` |
-| `order_by`                    | string         | no       | Return projects ordered by `id`, `name`, `path`, `created_at`, `updated_at`, `similarity` <sup>1</sup>, `star_count` or `last_activity_at` fields. Default is `created_at` |
-| `sort`                        | string         | no       | Return projects sorted in `asc` or `desc` order. Default is `desc` |
-| `search`                      | string         | no       | Return list of authorized projects matching the search criteria |
+| `id`                          | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `archived`                    | boolean        | no       | Limit by archived status. |
+| `visibility`                  | string         | no       | Limit by visibility `public`, `internal`, or `private`. |
+| `order_by`                    | string         | no       | Return projects ordered by `id`, `name`, `path`, `created_at`, `updated_at`, `similarity` <sup>1</sup>, `star_count` or `last_activity_at` fields. Default is `created_at`. |
+| `sort`                        | string         | no       | Return projects sorted in `asc` or `desc` order. Default is `desc`. |
+| `search`                      | string         | no       | Return list of authorized projects matching the search criteria. |
 | `simple`                      | boolean        | no       | Return only limited fields for each project. This is a no-op without authentication where only simple fields are returned. |
-| `owned`                       | boolean        | no       | Limit by projects owned by the current user |
-| `starred`                     | boolean        | no       | Limit by projects starred by the current user |
-| `topic`                       | string         | no       | Return projects matching the topic |
-| `with_issues_enabled`         | boolean        | no       | Limit by projects with issues feature enabled. Default is `false` |
-| `with_merge_requests_enabled` | boolean        | no       | Limit by projects with merge requests feature enabled. Default is `false` |
-| `with_shared`                 | boolean        | no       | Include projects shared to this group. Default is `true` |
-| `include_subgroups`           | boolean        | no       | Include projects in subgroups of this group. Default is `false` |
-| `min_access_level`            | integer        | no       | Limit to projects where current user has at least this [role (`access_level`)](members.md#roles) |
-| `with_custom_attributes`      | boolean        | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
+| `owned`                       | boolean        | no       | Limit by projects owned by the current user. |
+| `starred`                     | boolean        | no       | Limit by projects starred by the current user. |
+| `topic`                       | string         | no       | Return projects matching the topic. |
+| `with_issues_enabled`         | boolean        | no       | Limit by projects with issues feature enabled. Default is `false`. |
+| `with_merge_requests_enabled` | boolean        | no       | Limit by projects with merge requests feature enabled. Default is `false`. |
+| `with_shared`                 | boolean        | no       | Include projects shared to this group. Default is `true`. |
+| `include_subgroups`           | boolean        | no       | Include projects in subgroups of this group. Default is `false`. |
+| `min_access_level`            | integer        | no       | Limit to projects where current user has at least this [role (`access_level`)](members.md#roles). |
+| `with_custom_attributes`      | boolean        | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
 | `with_security_reports`       | boolean        | no       | Return only projects that have security reports artifacts present in any of their builds. This means "projects with security reports enabled". Default is `false`. Ultimate only. |
 
 **Footnotes**:
@@ -610,18 +606,18 @@ Parameters:
 
 | Attribute                     | Type           | Required | Description |
 | ----------------------------- | -------------- | -------- | ----------- |
-| `id`                          | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `archived`                    | boolean        | no       | Limit by archived status |
-| `visibility`                  | string         | no       | Limit by visibility `public`, `internal`, or `private` |
-| `order_by`                    | string         | no       | Return projects ordered by `id`, `name`, `path`, `created_at`, `updated_at`, `star_count` or `last_activity_at` fields. Default is `created_at` |
-| `sort`                        | string         | no       | Return projects sorted in `asc` or `desc` order. Default is `desc` |
-| `search`                      | string         | no       | Return list of authorized projects matching the search criteria |
+| `id`                          | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `archived`                    | boolean        | no       | Limit by archived status. |
+| `visibility`                  | string         | no       | Limit by visibility `public`, `internal`, or `private`. |
+| `order_by`                    | string         | no       | Return projects ordered by `id`, `name`, `path`, `created_at`, `updated_at`, `star_count` or `last_activity_at` fields. Default is `created_at`. |
+| `sort`                        | string         | no       | Return projects sorted in `asc` or `desc` order. Default is `desc`. |
+| `search`                      | string         | no       | Return list of authorized projects matching the search criteria. |
 | `simple`                      | boolean        | no       | Return only limited fields for each project. This is a no-op without authentication where only simple fields are returned. |
-| `starred`                     | boolean        | no       | Limit by projects starred by the current user |
-| `with_issues_enabled`         | boolean        | no       | Limit by projects with issues feature enabled. Default is `false` |
-| `with_merge_requests_enabled` | boolean        | no       | Limit by projects with merge requests feature enabled. Default is `false` |
-| `min_access_level`            | integer        | no       | Limit to projects where current user has at least this [role (`access_level`)](members.md#roles) |
-| `with_custom_attributes`      | boolean        | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
+| `starred`                     | boolean        | no       | Limit by projects starred by the current user. |
+| `with_issues_enabled`         | boolean        | no       | Limit by projects with issues feature enabled. Default is `false`. |
+| `with_merge_requests_enabled` | boolean        | no       | Limit by projects with merge requests feature enabled. Default is `false`. |
+| `min_access_level`            | integer        | no       | Limit to projects where current user has at least this [role (`access_level`)](members.md#roles). |
+| `with_custom_attributes`      | boolean        | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
 
 Example response:
 
@@ -856,13 +852,13 @@ Parameters:
 
 | Attribute        | Type           | Required | Description |
 |:-----------------|:---------------|:---------|:------------|
-| `id`             | integer/string | yes      | ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `username`       | string         | no       | Return single user with a specific username |
-| `search`         | string         | no       | Search users by name, email, username |
-| `active`         | boolean        | no       | Return only active users |
-| `blocked`        | boolean        | no       | Return only blocked users |
-| `created_after`  | datetime       | no       | Return users created after the specified time |
-| `created_before` | datetime       | no       | Return users created before the specified time |
+| `id`             | integer/string | yes      | ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `username`       | string         | no       | Return single user with a specific username. |
+| `search`         | string         | no       | Search users by name, email, username. |
+| `active`         | boolean        | no       | Return only active users. |
+| `blocked`        | boolean        | no       | Return only blocked users. |
+| `created_after`  | datetime       | no       | Return users created after the specified time. |
+| `created_before` | datetime       | no       | Return users created before the specified time. |
 
 Example response:
 
@@ -941,7 +937,9 @@ by the group or subgroups.
 
 This endpoint is an [experiment](../policy/development_stages_support.md) and might be changed or removed without notice.
 
-Requires Owner role for the group.
+Prerequisites:
+
+- You must have the Owner role for the group.
 
 ```plaintext
 GET /groups/:id/users
@@ -1027,16 +1025,16 @@ Parameters:
 
 | Attribute                | Type              | Required | Description |
 | ------------------------ | ----------------- | -------- | ----------- |
-| `id`                     | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) of the immediate parent group |
-| `skip_groups`            | array of integers | no       | Skip the group IDs passed |
-| `all_available`          | boolean           | no       | Show all the groups you have access to (defaults to `false` for authenticated users, `true` for administrators); Attributes `owned` and `min_access_level` have precedence |
-| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria. Only subgroup short paths are searched (not full paths) |
-| `order_by`               | string            | no       | Order groups by `name`, `path` or `id`. Default is `name` |
-| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc` |
-| `statistics`             | boolean           | no       | Include group statistics (administrators only) |
-| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
-| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user |
-| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles) |
+| `id`                     | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) of the immediate parent group. |
+| `skip_groups`            | array of integers | no       | Skip the group IDs passed. |
+| `all_available`          | boolean           | no       | Show all the groups you have access to (defaults to `false` for authenticated users, `true` for administrators). Attributes `owned` and `min_access_level` have precedence. |
+| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria. Only subgroup short paths are searched (not full paths). |
+| `order_by`               | string            | no       | Order groups by `name`, `path` or `id`. Default is `name`. |
+| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc`. |
+| `statistics`             | boolean           | no       | Include group statistics (administrators only). |
+| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
+| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user. |
+| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles). |
 | `all_available`          | boolean           | no       | When `true`, returns all accessible groups. When `false`, returns only groups where the user is a member. Defaults to `false` for users, `true` for administrators. Unauthenticated requests always return all public groups. The `owned` and `min_access_level` attributes take precedence. |
 | `active`                 | boolean           | no       | Limit by groups that are not archived and not marked for deletion. |
 
@@ -1106,16 +1104,16 @@ Parameters:
 
 | Attribute                | Type              | Required | Description |
 | ------------------------ | ----------------- | -------- | ----------- |
-| `id`                     | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) of the immediate parent group |
-| `skip_groups`            | array of integers | no       | Skip the group IDs passed |
+| `id`                     | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) of the immediate parent group. |
+| `skip_groups`            | array of integers | no       | Skip the group IDs passed. |
 | `all_available`          | boolean           | no       | When `true`, returns all accessible groups. When `false`, returns only groups where the user is a member. Defaults to `false` for users, `true` for administrators. Unauthenticated requests always return all public groups. The `owned` and `min_access_level` attributes take precedence. |
-| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria. Only descendant group short paths are searched (not full paths) |
-| `order_by`               | string            | no       | Order groups by `name`, `path`, or `id`. Default is `name` |
-| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc` |
-| `statistics`             | boolean           | no       | Include group statistics (administrators only) |
-| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
-| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user |
-| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles) |
+| `search`                 | string            | no       | Return the list of authorized groups matching the search criteria. Only descendant group short paths are searched (not full paths). |
+| `order_by`               | string            | no       | Order groups by `name`, `path`, or `id`. Default is `name`. |
+| `sort`                   | string            | no       | Order groups in `asc` or `desc` order. Default is `asc`. |
+| `statistics`             | boolean           | no       | Include group statistics (administrators only). |
+| `with_custom_attributes` | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
+| `owned`                  | boolean           | no       | Limit to groups explicitly owned by the current user. |
+| `min_access_level`       | integer           | no       | Limit to groups where current user has at least this [role (`access_level`)](members.md#roles). |
 | `active`                 | boolean           | no       | Limit by groups that are not archived and not marked for deletion. |
 
 ```plaintext
@@ -1222,14 +1220,14 @@ Parameters:
 
 | Attribute                             | Type              | Required | Description |
 | ------------------------------------- | ----------------- | -------- | ---------- |
-| `id`                                  | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `skip_groups`                         | array of integers | no       | Skip the specified group IDs |
-| `search`                              | string            | no       | Return the list of authorized groups matching the search criteria |
-| `order_by`                            | string            | no       | Order groups by `name`, `path`, `id`, or `similarity`. Default is `name` |
-| `sort`                                | string            | no       | Order groups in `asc` or `desc` order. Default is `asc` |
+| `id`                                  | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `skip_groups`                         | array of integers | no       | Skip the specified group IDs. |
+| `search`                              | string            | no       | Return the list of authorized groups matching the search criteria. |
+| `order_by`                            | string            | no       | Order groups by `name`, `path`, `id`, or `similarity`. Default is `name`. |
+| `sort`                                | string            | no       | Order groups in `asc` or `desc` order. Default is `asc`. |
 | `visibility`                          | string            | no       | Limit to groups with `public`, `internal`, or `private` visibility. |
-| `min_access_level`                    | integer           | no       | Limit to groups where current user has at least the specified [role (`access_level`)](members.md#roles) |
-| `with_custom_attributes`              | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
+| `min_access_level`                    | integer           | no       | Limit to groups where current user has at least the specified [role (`access_level`)](members.md#roles). |
+| `with_custom_attributes`              | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
 
 ```plaintext
 GET /groups/:id/groups/shared
@@ -1301,11 +1299,11 @@ Parameters:
 
 | Attribute                             | Type              | Required | Description |
 | ------------------------------------- | ----------------- | -------- | ---------- |
-| `id`                                  | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `search`                              | string            | no       | Return the list of authorized groups matching the search criteria |
-| `min_access_level`                    | integer           | no       | Limit to groups where current user has at least the specified [role (`access_level`)](members.md#roles) |
-| `relation`                            | array of strings  | no       | Filter the groups by relation (direct or inherited) |
-| `with_custom_attributes`              | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only) |
+| `id`                                  | integer/string    | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `search`                              | string            | no       | Return the list of authorized groups matching the search criteria. |
+| `min_access_level`                    | integer           | no       | Limit to groups where current user has at least the specified [role (`access_level`)](members.md#roles). |
+| `relation`                            | array of strings  | no       | Filter the groups by relation (direct or inherited). |
+| `with_custom_attributes`              | boolean           | no       | Include [custom attributes](custom_attributes.md) in response (administrators only). |
 
 ```plaintext
 GET /groups/:id/invited_groups
@@ -1406,7 +1404,7 @@ Parameters:
 | `default_branch_protection_defaults` | hash    | no       | Introduced in GitLab 17.0. For available options, see [Options for `default_branch_protection_defaults`](#options-for-default_branch_protection_defaults). |
 | `description`                        | string  | no       | The group's description. |
 | `enabled_git_access_protocol`        | string  | no       | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `all` to allow both protocols. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/436618) in GitLab 16.9. |
-| `emails_disabled`                    | boolean | no       | _([Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127899) in GitLab 16.5.)_ Disable email notifications. Use `emails_enabled` instead. |
+| `emails_disabled`                    | boolean | no       | ([Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127899) in GitLab 16.5.) Disable email notifications. Use `emails_enabled` instead. |
 | `emails_enabled`                     | boolean | no       | Enable email notifications. |
 | `lfs_enabled`                        | boolean | no       | Enable/disable Large File Storage (LFS) for the projects in this group. |
 | `mentions_disabled`                  | boolean | no       | Disable the capability of a group from getting mentioned. |
@@ -1416,7 +1414,7 @@ Parameters:
 | `request_access_enabled`             | boolean | no       | Allow users to request member access. |
 | `require_two_factor_authentication`  | boolean | no       | Require all users in this group to set up two-factor authentication. |
 | `share_with_group_lock`              | boolean | no       | Prevent sharing a project with another group within this group. |
-| `subgroup_creation_level`            | string  | no       | Allowed to [create subgroups](../user/group/subgroups/_index.md#create-a-subgroup). Can be `owner` (Owners), or `maintainer` (users with the Maintainer role). |
+| `subgroup_creation_level`            | string  | no       | Allowed to [create subgroups](../user/group/subgroups/_index.md#create-a-subgroup). Can be `owner` (users with the Owner role), or `maintainer` (users with the Maintainer role). |
 | `two_factor_grace_period`            | integer | no       | Time before Two-factor authentication is enforced (in hours). |
 | `visibility`                         | string  | no       | The group's visibility. Can be `private`, `internal`, or `public`. |
 | `membership_lock`                    | boolean | no       | Users cannot be added to projects in this group. Premium and Ultimate only. |
@@ -1432,11 +1430,11 @@ The `default_branch_protection` attribute determines whether users with the Deve
 
 | Value | Description |
 |-------|-------------|
-| `0`   | No protection. Users with the Developer or Maintainer role can: <br>- Push new commits<br>- Force push changes<br>- Delete the branch |
-| `1`   | Partial protection. Users with the Developer or Maintainer role can: <br>- Push new commits |
-| `2`   | Full protection. Only users with the Maintainer role can: <br>- Push new commits |
-| `3`   | Protected against pushes. Users with the Maintainer role can: <br>- Push new commits<br>- Force push changes<br>- Accept merge requests<br>Users with the Developer role can:<br>- Accept merge requests |
-| `4`   | Full protection after initial push. User with the Developer role can: <br>- Push commit to empty repository.<br> Users with the Maintainer role can: <br>- Push new commits<br>- Accept merge requests |
+| `0`   | No protection. Users with the Developer or Maintainer role can: <br>- Push new commits.<br>- Force push changes.<br>- Delete the branch. |
+| `1`   | Partial protection. Users with the Developer or Maintainer role can: <br>- Push new commits. |
+| `2`   | Full protection. Only users with the Maintainer role can: <br>- Push new commits. |
+| `3`   | Protected against pushes. Users with the Maintainer role can: <br>- Push new commits.<br>- Force push changes.<br>- Accept merge requests.<br>Users with the Developer role can:<br>- Accept merge requests. |
+| `4`   | Full protection after initial push. User with the Developer role can: <br>- Push commit to empty repository.<br> Users with the Maintainer role can: <br>- Push new commits.<br>- Accept merge requests. |
 
 #### Options for `default_branch_protection_defaults`
 
@@ -1470,6 +1468,58 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
      "https://gitlab.example.com/api/v4/groups/"
 ```
 
+### Delete a group
+
+{{< history >}}
+
+- Marking groups for deletion [available](https://gitlab.com/groups/gitlab-org/-/epics/17208) on Free tier in GitLab 18.0.
+
+{{< /history >}}
+
+Prerequisites:
+
+- You must be an administrator or have the Owner role for the group.
+
+Marks a group for deletion. Groups are deleted at the end of the retention period:
+
+- On GitLab.com, groups are retained for 30 days.
+- On GitLab Self-Managed, the retention period is controlled by the 
+  [instance settings](../administration/settings/visibility_and_access_controls.md#deletion-protection).
+
+This endpoint can also immediately delete a subgroup that was previously marked for deletion.
+
+```plaintext
+DELETE /groups/:id
+```
+
+Parameters:
+
+| `id`                 | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+| `permanently_remove` | boolean/string | no       | If `true`, immediately deletes a subgroup that is already marked for deletion. Cannot delete top-level groups. |
+| `full_path`          | string         | no       | The full path to the subgroup. Used to confirm deletion of the subgroup. If `permanently_remove` is `true`, this attribute is required. To find the subgroup path, see the [group details](groups.md#get-a-single-group). |
+
+The response is `202 Accepted` if the user has authorization.
+
+{{< alert type="note" >}}
+
+You cannot delete a GitLab.com group that is linked to a subscription. You must first [link the subscription](../subscriptions/manage_subscription.md#link-subscription-to-a-group) with a different group.
+
+{{< /alert >}}
+
+#### Restore a group marked for deletion
+
+Restores a group that was previously marked for deletion.
+
+```plaintext
+POST /groups/:id/restore
+```
+
+Parameters:
+
+| Attribute | Type           | Required | Description |
+|-----------|----------------|----------|-------------|
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths). |
+
 ### Archive a group
 
 {{< details >}}
@@ -1496,7 +1546,7 @@ Archive a group.
 
 Prerequisites:
 
-- You must be an administrator or be assigned the Owner role on the group.
+- You must be an administrator or have the Owner role for the group.
 
 This endpoint returns a `422` unprocessable entity error if the group is already archived.
 
@@ -1508,7 +1558,7 @@ Parameters:
 
 | Attribute                             | Type              | Required | Description |
 | ------------------------------------- | ----------------- | -------- | ---------- |
-| `id`                                  | integer or string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) owned by the authenticated user |
+| `id`                                  | integer or string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) owned by the authenticated user. |
 
 Example response:
 
@@ -1570,7 +1620,7 @@ Example response:
 }
 ```
 
-### Unarchive a group
+#### Unarchive a group
 
 {{< details >}}
 
@@ -1596,7 +1646,7 @@ Unarchive a group.
 
 Prerequisites:
 
-- You must be an administrator or be assigned the Owner role on the group.
+- You must be an administrator or have the Owner role for the group.
 
 This endpoint returns a `422` unprocessable entity error if the group is not archived.
 
@@ -1608,7 +1658,7 @@ Parameters:
 
 | Attribute                             | Type              | Required | Description |
 | ------------------------------------- | ----------------- | -------- | ---------- |
-| `id`                                  | integer or string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) owned by the authenticated user |
+| `id`                                  | integer or string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) owned by the authenticated user. |
 
 Example response:
 
@@ -1670,31 +1720,151 @@ Example response:
 }
 ```
 
-### Sync a group with LDAP
+### Transfer a group
 
-{{< details >}}
+Transfers a group to a new parent group or transforms a subgroup into a top-level group.
 
-- Tier: Premium, Ultimate
-- Offering: GitLab Self-Managed
+Prerequisites:
 
-{{< /details >}}
-
-Syncs the group with its linked LDAP group. Only available to group owners and administrators.
+- You must have the Owner role for the group.
+- If transferring a group, you must have permission to [create a subgroup](../user/group/subgroups/_index.md#create-a-subgroup) in the new parent group.
+- If transforming a subgroup, you must have [permission to create a top-level group](../administration/user_settings.md).
 
 ```plaintext
-POST /groups/:id/ldap_sync
+POST /groups/:id/transfer
 ```
 
 Parameters:
 
-- `id` (required) - The ID or path of a user group
+| Attribute  | Type    | Required | Description |
+|------------|---------|----------|-------------|
+| `id`       | integer | yes      | ID of the group to transfer. |
+| `id`       | integer | yes      | ID of the group to transfer. |
+| `group_id` | integer | no       | ID of the new parent group. If unspecified, the group is transformed into a top-level group. |
 
-### Update group attributes
+```shell
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
+     "https://gitlab.example.com/api/v4/groups/4/transfer?group_id=7"
+```
+
+#### List all locations available for group transfer
+
+Lists all available parent groups to transfer a specified group.
+
+```plaintext
+GET /groups/:id/transfer_locations
+```
+
+| Attribute | Type              | Required | Description |
+|-----------|-------------------|----------|-------------|
+| `id`      | integer or string | Yes      | The ID or [URL-encoded path of the group to transfer](rest/_index.md#namespaced-paths). |
+| `search`  | string            | No       | The name of a specific group to search for. |
+
+Example request:
+
+```shell
+curl --request GET "https://gitlab.example.com/api/v4/groups/1/transfer_locations"
+```
+
+Example response:
+
+```json
+[
+  {
+    "id": 27,
+    "web_url": "https://gitlab.example.com/groups/gitlab",
+    "name": "GitLab",
+    "avatar_url": null,
+    "full_name": "GitLab",
+    "full_path": "GitLab"
+  },
+  {
+    "id": 31,
+    "web_url": "https://gitlab.example.com/groups/foobar",
+    "name": "FooBar",
+    "avatar_url": null,
+    "full_name": "FooBar",
+    "full_path": "FooBar"
+  }
+]
+```
+
+#### Transfer a project to a group
+
+{{< details >}}
+
+- Tier: Free, Premium, Ultimate
+- Offering: GitLab Self-Managed, GitLab Dedicated
+
+{{< /details >}}
+
+Transfers a project to another group namespace. Alternatively, use the [transfer a project to a new namespace](projects.md#transfer-a-project-to-a-new-namespace) endpoint instead.
+
+{{< alert type="note" >}}
+
+The transfer process may fail if tagged packages exist in the project's repository.
+
+{{< /alert >}}
+
+Prerequisites:
+
+- You must be an administrator for the instance.
+
+```plaintext
+POST /groups/:id/projects/:project_id
+```
+
+Parameters:
+
+| Attribute    | Type           | Required | Description |
+| ------------ | -------------- | -------- | ----------- |
+| `id`         | integer/string | yes      | The ID or [URL-encoded path of the target group](rest/_index.md#namespaced-paths). |
+| `project_id` | integer/string | yes      | The ID or [URL-encoded path of the project](rest/_index.md#namespaced-paths). |
+
+```shell
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
+     "https://gitlab.example.com/api/v4/groups/4/projects/56"
+```
+
+### Invite groups
+
+These endpoints are used to for group invitations. For more information, see [invite a group to a group](../user/project/members/sharing_projects_groups.md#invite-a-group-to-a-group).
+
+#### Create a group invitation
+
+Creates a group invitation that adds a target group to a specified group.
+
+```plaintext
+POST /groups/:id/share
+```
+
+| `id`           | integer/string | yes      | The ID or [URL-encoded path of the target group](rest/_index.md#namespaced-paths). |
+| `group_id`     | integer        | yes      | The ID of the group to invite. |
+| `group_access` | integer        | yes      | The default [role (`access_level`)](members.md#roles) to assign to the invited group. |
+| `expires_at`   | date (ISO 8601) | no       | The date the group invitation expires. |
+| `member_role_id`   | integer         | no       | The ID of a [custom role](../user/custom_roles/_index.md#assign-a-custom-role-to-an-invited-group) to assign to the invited group. If defined, `group_access` must match the base role used to create the custom role. |
+
+Returns `200` and the group details on success.
+
+#### Delete a group invitation
+
+Deletes a group invitation and removes access to the target group from the specified group.
+
+```plaintext
+DELETE /groups/:id/share/:group_id
+```
+
+| Attribute  | Type           | Required | Description |
+|------------|----------------|----------|-------------|
+| `id`       | integer/string | yes      | The ID or [URL-encoded path of the target group](rest/_index.md#namespaced-paths). |
+| `group_id` | integer        | yes      | The ID of the group to disinvite. |
+
+Returns `204` and no content on success.
+
+## Update group attributes
 
 {{< history >}}
 
-- `unique_project_download_limit`, `unique_project_download_limit_interval_in_seconds`, and `unique_project_download_limit_allowlist` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92970) in GitLab 15.3 [with a flag](../administration/feature_flags/_index.md) named `limit_unique_project_downloads_per_namespace_user`. Disabled by default.
-- [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/365724) in GitLab 15.6.
 - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183101) in GitLab 18.0. Feature flag `limit_unique_project_downloads_per_namespace_user` removed.
 - `web_based_commit_signing_enabled` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/193928) in GitLab 18.2 [with a flag](../administration/feature_flags/_index.md) named `use_web_based_commit_signing_enabled`. Disabled by default.
 {{< /history >}}
@@ -1707,7 +1877,11 @@ This feature is available for testing, but not ready for production use.
 
 {{< /alert >}}
 
-Updates the project group. Only available to group owners and administrators.
+Updates the attributes for a specified group.
+
+Prerequisites:
+
+- You must be an administrator or have the Owner role for the group.
 
 ```plaintext
 PUT /groups/:id
@@ -1725,7 +1899,7 @@ PUT /groups/:id
 | `default_branch_protection_defaults`                 | hash              | no       | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/408314) in GitLab 17.0. For available options, see [Options for `default_branch_protection_defaults`](#options-for-default_branch_protection_defaults). |
 | `description`                                        | string            | no       | The description of the group. |
 | `enabled_git_access_protocol`                        | string            | no       | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `all` to allow both protocols. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/436618) in GitLab 16.9. |
-| `emails_disabled`                                    | boolean           | no       | _([Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127899) in GitLab 16.5.)_ Disable email notifications. Use `emails_enabled` instead. |
+| `emails_disabled`                                    | boolean           | no       | ([Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127899) in GitLab 16.5.) Disable email notifications. Use `emails_enabled` instead. |
 | `emails_enabled`                                     | boolean           | no       | Enable email notifications. |
 | `lfs_enabled`                                        | boolean           | no       | Enable/disable Large File Storage (LFS) for the projects in this group. |
 | `mentions_disabled`                                  | boolean           | no       | Disable the capability of a group from getting mentioned. |
@@ -1735,20 +1909,20 @@ PUT /groups/:id
 | `require_two_factor_authentication`                  | boolean           | no       | Require all users in this group to set up two-factor authentication. |
 | `shared_runners_setting`                             | string            | no       | See [Options for `shared_runners_setting`](#options-for-shared_runners_setting). Enable or disable instance runners for a group's subgroups and projects. |
 | `share_with_group_lock`                              | boolean           | no       | Prevent sharing a project with another group within this group. |
-| `subgroup_creation_level`                            | string            | no       | Allowed to [create subgroups](../user/group/subgroups/_index.md#create-a-subgroup). Can be `owner` (Owners), or `maintainer` (users with the Maintainer role). |
+| `subgroup_creation_level`                            | string            | no       | Allowed to [create subgroups](../user/group/subgroups/_index.md#create-a-subgroup). Can be `owner` (users with the Owner role), or `maintainer` (users with the Maintainer role). |
 | `two_factor_grace_period`                            | integer           | no       | Time before Two-factor authentication is enforced (in hours). |
 | `visibility`                                         | string            | no       | The visibility level of the group. Can be `private`, `internal`, or `public`. |
 | `extra_shared_runners_minutes_limit`                 | integer           | no       | Can be set by administrators only. Additional compute minutes for this group. GitLab Self-Managed, Premium and Ultimate only. |
 | `file_template_project_id`                           | integer           | no       | The ID of a project to load custom file templates from. Premium and Ultimate only. |
 | `membership_lock`                                    | boolean           | no       | Users cannot be added to projects in this group. Premium and Ultimate only. |
-| `prevent_forking_outside_group`                      | boolean           | no       | When enabled, users can **not** fork projects from this group to external namespaces. Premium and Ultimate only. |
+| `prevent_forking_outside_group`                      | boolean           | no       | When enabled, users can not fork projects from this group to external namespaces. Premium and Ultimate only. |
 | `shared_runners_minutes_limit`                       | integer           | no       | Can be set by administrators only. Maximum number of monthly compute minutes for this group. Can be `nil` (default; inherit system default), `0` (unlimited), or `> 0`. GitLab Self-Managed, Premium and Ultimate only. |
 | `unique_project_download_limit`                      | integer           | no       | Maximum number of unique projects a user can download in the specified time period before they are banned. Available only on top-level groups. Default: 0, Maximum: 10,000. Ultimate only. |
 | `unique_project_download_limit_interval_in_seconds`  | integer           | no       | Time period during which a user can download a maximum amount of projects before they are banned. Available only on top-level groups. Default: 0, Maximum: 864,000 seconds (10 days). Ultimate only. |
 | `unique_project_download_limit_allowlist`            | array of strings  | no       | List of usernames excluded from the unique project download limit. Available only on top-level groups. Default: `[]`, Maximum: 100 usernames. Ultimate only. |
-| `unique_project_download_limit_alertlist`            | array of integers | no       | List of user IDs that are emailed when the unique project download limit is exceeded. Available only on top-level groups. Default: `[]`, Maximum: 100 user IDs. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110201) in GitLab 15.9. Ultimate only. |
-| `auto_ban_user_on_excessive_projects_download`       | boolean           | no       | When enabled, users are automatically banned from the group when they download more than the maximum number of unique projects specified by `unique_project_download_limit` and `unique_project_download_limit_interval_in_seconds`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94159) in GitLab 15.4. Ultimate only. |
-| `ip_restriction_ranges`                              | string            | no       | Comma-separated list of IP addresses or subnet masks to restrict group access. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/351493) in GitLab 15.4. Premium and Ultimate only. |
+| `unique_project_download_limit_alertlist`            | array of integers | no       | List of user IDs that are emailed when the unique project download limit is exceeded. Available only on top-level groups. Default: `[]`, Maximum: 100 user IDs. Ultimate only. |
+| `auto_ban_user_on_excessive_projects_download`       | boolean           | no       | When enabled, users are automatically banned from the group when they download more than the maximum number of unique projects specified by `unique_project_download_limit` and `unique_project_download_limit_interval_in_seconds`. Ultimate only. |
+| `ip_restriction_ranges`                              | string            | no       | Comma-separated list of IP addresses or subnet masks to restrict group access. Premium and Ultimate only. |
 | `allowed_email_domains_list`                         | string            | no       | Comma-separated list of email address domains to allow group access. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/351494) in 17.4. GitLab Premium and Ultimate only. |
 | `wiki_access_level`                                  | string            | no       | The wiki access level. Can be `disabled`, `private`, or `enabled`. Premium and Ultimate only. |
 | `duo_availability`                                   | string | no | Duo availability setting. Valid values are: `default_on`, `default_off`, `never_on`. Note: In the UI, `never_on` is displayed as "Always Off". |
@@ -1849,7 +2023,7 @@ Users of [GitLab Premium or Ultimate](https://about.gitlab.com/pricing/) also se
 `lock_duo_features_enabled`,
 `duo_availability`, and `experiment_features_enabled` attributes.
 
-#### Options for `shared_runners_setting`
+### Options for `shared_runners_setting`
 
 The `shared_runners_setting` attribute determines whether instance runners are enabled for a group's subgroups and projects.
 
@@ -1860,15 +2034,11 @@ The `shared_runners_setting` attribute determines whether instance runners are e
 | `disabled_and_unoverridable` | Disables instance runners for all projects and subgroups in this group, and prevents subgroups from overriding this setting. |
 | `disabled_with_override`     | (Deprecated. Use `disabled_and_overridable`) Disables instance runners for all projects and subgroups in this group, but allows subgroups to override this setting. |
 
-### Group members
-
-See the [Group Members](members.md) documentation.
-
-### Update group avatars
+## Update group avatars
 
 Update group avatars.
 
-#### Download a group avatar
+### Download a group avatar
 
 Get a group avatar. This endpoint can be accessed without authentication if the
 group is publicly accessible.
@@ -1879,7 +2049,7 @@ GET /groups/:id/avatar
 
 | Attribute | Type           | Required | Description |
 |-----------|----------------|----------|-------------|
-| `id`      | integer/string | yes      | ID of the group |
+| `id`      | integer/string | yes      | ID of the group. |
 
 Example:
 
@@ -1890,7 +2060,7 @@ curl --header "PRIVATE-TOKEN: $GITLAB_LOCAL_TOKEN" \
   "https://gitlab.example.com/api/v4/groups/4/avatar"
 ```
 
-#### Upload a group avatar
+### Upload a group avatar
 
 To upload an avatar file from your file system, use the `--form` argument. This causes
 curl to post data using the header `Content-Type: multipart/form-data`. The
@@ -1902,13 +2072,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab
      --form "avatar=@/tmp/example.png"
 ```
 
-#### Remove a group avatar
-
-{{< history >}}
-
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96421) in GitLab 15.4.
-
-{{< /history >}}
+### Remove a group avatar
 
 To remove a group avatar, use a blank value for the `avatar` attribute.
 
@@ -1919,60 +2083,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab
      --data "avatar="
 ```
 
-### Delete a group
-
-{{< history >}}
-
-- Immediately deleting subgroups was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360008) in GitLab 15.3 [with a flag](../administration/feature_flags/_index.md) named `immediate_delete_subgroup_api`. Disabled by default.
-- Immediately deleting subgroups was [enabled on GitLab.com and GitLab Self-Managed](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) in GitLab 15.4.
-- Immediately deleting subgroups was [enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) by default in GitLab 15.4.
-- The flag `immediate_delete_subgroup_api` for immediately deleting subgroups was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/374069) in GitLab 15.9.
-- [Marking group for deletion was moved](https://gitlab.com/groups/gitlab-org/-/epics/17208) from GitLab Premium to GitLab Free in 18.0.
-
-{{< /history >}}
-
-Only available to group owners and administrators.
-
-This endpoint:
-
-- Marks the group for deletion. The deletion happens 7 days later by default, but you can change the retention period in the [instance settings](../administration/settings/visibility_and_access_controls.md#deletion-protection).
-- Deletes a subgroup immediately if the subgroup is marked for deletion (GitLab 15.4 and later). The endpoint does not immediately delete top-level groups.
-
-```plaintext
-DELETE /groups/:id
-```
-
-Parameters:
-
-| Attribute            | Type           | Required | Description |
-|----------------------|----------------|----------|-------------|
-| `id`                 | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `permanently_remove` | boolean/string | no       | Immediately deletes a subgroup if it is marked for deletion. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) in GitLab 15.4 for Premium and Ultimate only and moved to GitLab Free in 18.0. |
-| `full_path`          | string         | no       | Full path of subgroup to use with `permanently_remove`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) in GitLab 15.4. To find the subgroup path, see the [group details](groups.md#get-a-single-group). |
-
-The response is `202 Accepted` if the user has authorization.
-
-{{< alert type="note" >}}
-
-A GitLab.com group can't be deleted if it is linked to a subscription. To delete such a group, first [link the subscription](../subscriptions/manage_subscription.md#link-subscription-to-a-group) with a different group.
-
-{{< /alert >}}
-
-#### Restore a group marked for deletion
-
-Restores a group marked for deletion.
-
-```plaintext
-POST /groups/:id/restore
-```
-
-Parameters:
-
-| Attribute | Type           | Required | Description |
-|-----------|----------------|----------|-------------|
-| `id`      | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-
-### Revoke a token
+## Revoke a token
 
 {{< history >}}
 
@@ -2047,131 +2158,28 @@ Example response:
 }
 ```
 
-### Share groups with groups
+## Sync a group with LDAP
 
-These endpoints create and delete links for sharing a group with another group. For more information, see the related discussion in the [GitLab Groups](../user/project/members/sharing_projects_groups.md#invite-a-group-to-a-group) page.
+{{< details >}}
 
-#### Create a link to share a group with another group
+- Tier: Premium, Ultimate
+- Offering: GitLab Self-Managed
 
-Share group with another group. Returns `200` and the [group details](#get-a-single-group) on success.
+{{< /details >}}
+
+Syncs a specified group with its linked LDAP group.
+
+Prerequisites:
+
+- You must be an administrator or have the Owner role for the group.
 
 ```plaintext
-POST /groups/:id/share
+POST /groups/:id/ldap_sync
 ```
 
-| Attribute      | Type           | Required | Description |
-|----------------|----------------|----------|-------------|
-| `id`           | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `group_id`     | integer        | yes      | The ID of the group to share with |
-| `group_access` | integer        | yes      | The [role (`access_level`)](members.md#roles) to grant the group |
-| `expires_at`   | string         | no       | Share expiration date in ISO 8601 format: 2016-09-26 |
-| `member_role_id`   | integer         | no       | The ID of a [Custom Role](../user/custom_roles/_index.md#assign-a-custom-role-to-an-invited-group) to assign to the invited group |
-
-#### Delete the link that shares a group with another group
-
-Unshare the group from another group. Returns `204` and no content on success.
-
-```plaintext
-DELETE /groups/:id/share/:group_id
-```
-
-| Attribute  | Type           | Required | Description |
-|------------|----------------|----------|-------------|
-| `id`       | integer/string | yes      | The ID or [URL-encoded path of the group](rest/_index.md#namespaced-paths) |
-| `group_id` | integer        | yes      | The ID of the group to share with |
-
-### Transfer a project to a group
-
-Transfer a project to the Group namespace. Available only to instance administrators, although an [alternative API endpoint](projects.md#transfer-a-project-to-a-new-namespace)
-is available which does not require administrator access on the instance. Transferring projects may fail when tagged packages exist in the project's repository.
-
-```plaintext
-POST /groups/:id/projects/:project_id
-```
-
-Parameters:
-
-| Attribute    | Type           | Required | Description |
-| ------------ | -------------- | -------- | ----------- |
-| `id`         | integer/string | yes      | The ID or [URL-encoded path of the target group](rest/_index.md#namespaced-paths) |
-| `project_id` | integer/string | yes      | The ID or [URL-encoded path of the project](rest/_index.md#namespaced-paths) |
-
-```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
-     "https://gitlab.example.com/api/v4/groups/4/projects/56"
-```
-
-### Transfer a group
-
-Transfer a group to a new parent group or turn a subgroup to a top-level group. Available to administrators and users:
-
-- With the Owner role for the group to transfer.
-- With permission to [create a subgroup](../user/group/subgroups/_index.md#create-a-subgroup) in the new parent group if transferring a group.
-- With [permission to create a top-level group](../administration/user_settings.md) if turning a subgroup into a top-level group.
-
-```plaintext
-POST /groups/:id/transfer
-```
-
-Parameters:
-
-| Attribute  | Type    | Required | Description |
-|------------|---------|----------|-------------|
-| `id`       | integer | yes      | ID of the group to transfer. |
-| `group_id` | integer | no       | ID of the new parent group. When not specified, the group to transfer is instead turned into a top-level group. |
-
-```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
-     "https://gitlab.example.com/api/v4/groups/4/transfer?group_id=7"
-```
-
-#### List locations available for group transfer
-
-{{< history >}}
-
-- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371117) in GitLab 15.4
-
-{{< /history >}}
-
-Retrieve a list of groups to which the user can transfer a group.
-
-```plaintext
-GET /groups/:id/transfer_locations
-```
-
-| Attribute | Type              | Required | Description |
-|-----------|-------------------|----------|-------------|
-| `id`      | integer or string | Yes      | The ID or [URL-encoded path of the group to be transferred](rest/_index.md#namespaced-paths). |
-| `search`  | string            | No       | The group names to search for. |
-
-Example request:
-
-```shell
-curl --request GET "https://gitlab.example.com/api/v4/groups/1/transfer_locations"
-```
-
-Example response:
-
-```json
-[
-  {
-    "id": 27,
-    "web_url": "https://gitlab.example.com/groups/gitlab",
-    "name": "GitLab",
-    "avatar_url": null,
-    "full_name": "GitLab",
-    "full_path": "GitLab"
-  },
-  {
-    "id": 31,
-    "web_url": "https://gitlab.example.com/groups/foobar",
-    "name": "FooBar",
-    "avatar_url": null,
-    "full_name": "FooBar",
-    "full_path": "FooBar"
-  }
-]
-```
+| Attribute | Type                | Required | Description                            |
+| --------- | ------------------- | -------- | -------------------------------------- |
+| `id`      | integer or string   | Yes      | The ID or URL-encoded path of a group. |
 
 <!--
 ### Credentials inventory management
@@ -2189,7 +2197,7 @@ Example response:
 
 {{< /history >}}
 
-The Credentials Inventory API allows top-level-group owners to view, revoke, and rotate the credentials of their enterprise users on GitLab.com.
+View, revoke, and rotate the credentials of enterprise users on GitLab.com.
 
 Prerequisites:
 
@@ -2197,7 +2205,7 @@ Prerequisites:
 
 #### List all personal access tokens for a group
 
-Lists all personal access tokens associated with enterprise users in a top-level-group.
+Lists all personal access tokens associated with enterprise users in a top-level group.
 
 ```plaintext
 GET /groups/:id/manage/personal_access_tokens
@@ -2392,7 +2400,7 @@ Supported attributes:
 
 | Attribute | Type    | Required | Description |
 |:----------|:--------|:---------|:------------|
-| `key_id`  | integer | yes      | ID of existing key  |
+| `key_id`  | integer | yes      | ID of existing key.  |
 
 If successful, returns `204: No Content`.
 
@@ -2451,7 +2459,7 @@ Other possible responses:
   - The token was revoked.
   - You do not have access to the specified token.
 - `403: Forbidden` if the token is not allowed to rotate itself.
-- `404: Not Found` if the user is an group owner but the token does not exist.
+- `404: Not Found` if the user has the Owner role, but the token does not exist.
 - `405: Method Not Allowed` if the token is not a personal access token.
 
 #### Rotate a group or project access token for an enterprise user
@@ -2503,5 +2511,5 @@ Other possible responses:
   - The token was revoked.
   - You do not have access to the specified token.
 - `403: Forbidden` if the token is not allowed to rotate itself or token is not a bot user token.
-- `404: Not Found` if the user is a group owner but the token does not exist.
+- `404: Not Found` if the user has the Owner role, but the token does not exist.
 -->
diff --git a/doc/ci/_index.md b/doc/ci/_index.md
index d59657c3a23..36e7c556f96 100644
--- a/doc/ci/_index.md
+++ b/doc/ci/_index.md
@@ -2,7 +2,7 @@
 stage: Verify
 group: Pipeline Execution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn about building and testing your application.
+description: Build and test your application.
 title: Get started with GitLab CI/CD
 ---
 
diff --git a/doc/development/backend/ruby_style_guide.md b/doc/development/backend/ruby_style_guide.md
index 27380805df9..17fc461c7f1 100644
--- a/doc/development/backend/ruby_style_guide.md
+++ b/doc/development/backend/ruby_style_guide.md
@@ -157,7 +157,11 @@ def method
 end
 ```
 
-## Avoid ActiveRecord callbacks
+## Rails / ActiveRecord
+
+This section contains GitLab-specific guidelines for Rails and ActiveRecord usage.
+
+### Avoid ActiveRecord callbacks
 
 [ActiveRecord callbacks](https://guides.rubyonrails.org/active_record_callbacks.html) allow
 you to "trigger logic before or after an alteration of an object's state."
@@ -168,7 +172,7 @@ thoroughly understand the reasons for doing so.
 When adding new lifecycle events for ActiveRecord objects, it is preferable to
 add the logic to a service class instead of a callback.
 
-## Why callbacks should be avoided
+#### Why callbacks should be avoided
 
 In general, callbacks should be avoided because:
 
@@ -193,7 +197,7 @@ The GitLab codebase relies heavily on callbacks and it is hard to refactor them
 once added due to invisible dependencies. As a result, this guideline does not
 call for removing all existing callbacks.
 
-### When to use callbacks
+#### When to use callbacks
 
 Callbacks can be used in special cases. Some examples of cases where adding a
 callback makes sense:
@@ -203,7 +207,7 @@ callback makes sense:
 - Incrementing cache counts.
 - Data normalization that only relates to data on the current model.
 
-### Example of moving from a callback to a service
+#### Example of moving from a callback to a service
 
 There is a project with the following basic data model:
 
@@ -296,6 +300,56 @@ approach. But we already some benefits:
   than needing to refactor to `Project` and `Repository` classes.
 - Each instance of a `Project` factory does not create a second (`Repository`) object.
 
+### ApplicationRecord / ActiveRecord model scopes
+
+When creating a new scope, consider the following prefixes.
+
+#### `for_`
+
+For scopes which filter `where(belongs_to: record)`.
+For example:
+
+```ruby
+scope :for_project, ->(project) { where(project: project) }
+Timelogs.for_project(project)
+```
+
+#### `with_`
+
+For scopes which `joins`, `includes`, or filters `where(has_one: record)` or `where(has_many: record)` or `where(boolean condition)`
+For example:
+
+```ruby
+scope :with_labels, -> { includes(:labels) }
+AbuseReport.with_labels
+
+scope :with_status, ->(status) { where(status: status) }
+Clusters::AgentToken.with_status(:active)
+
+scope :with_due_date, -> { where.not(due_date: nil) }
+Issue.with_due_date
+```
+
+It is also fine to use custom scope names, for example:
+
+```ruby
+scope :undeleted, -> { where('policy_index >= 0') }
+Security::Policy.undeleted
+```
+
+#### `order_by_`
+
+For scopes which `order`.
+For example:
+
+```ruby
+scope :order_by_name, -> { order(:name) }
+Namespace.order_by_name
+
+scope :order_by_updated_at, ->(direction = :asc) { order(updated_at: direction) }
+Project.order_by_updated_at(:desc)
+```
+
 ## Styles we have no opinion on
 
 If a RuboCop rule is proposed and we choose not to add it, we should document that decision in this guide so it is more discoverable and link the relevant discussion as a reference.
@@ -336,53 +390,3 @@ For more information, see:
 
 - [Functional patterns](https://gitlab.com/gitlab-org/gitlab/-/tree/master/ee/lib/remote_development#functional-patterns)
 - [Railway-oriented programming and the `Result` class](https://gitlab.com/gitlab-org/gitlab/-/tree/master/ee/lib/remote_development#railway-oriented-programming-and-the-result-class)
-
-## ApplicationRecord / ActiveRecord model scopes
-
-When creating a new scope, consider the following prefixes.
-
-### `for_` 
-
-For scopes which filter `where(belongs_to: record)`.
-For example:
-
-```ruby
-scope :for_project, ->(project) { where(project: project) }
-Timelogs.for_project(project)
-```
-
-### `with_`
-
-For scopes which `joins`, `includes`, or filters `where(has_one: record)` or `where(has_many: record)` or `where(boolean condition)`
-For example:
-
-```ruby
-scope :with_labels, -> { includes(:labels) }
-AbuseReport.with_labels
-
-scope :with_status, ->(status) { where(status: status) }
-Clusters::AgentToken.with_status(:active)
-
-scope :with_due_date, -> { where.not(due_date: nil) }
-Issue.with_due_date
-```
-
-It is also fine to use custom scope names, for example:
-
-```ruby
-scope :undeleted, -> { where('policy_index >= 0') }
-Security::Policy.undeleted
-```
-
-### `order_by_`
-
-For scopes which `order`.
-For example:
-
-```ruby
-scope :order_by_name, -> { order(:name) }
-Namespace.order_by_name
-
-scope :order_by_updated_at, ->(direction = :asc) { order(updated_at: direction) }
-Project.order_by_updated_at(:desc)
-```
diff --git a/doc/development/internal_analytics/internal_event_instrumentation/event_definition_guide.md b/doc/development/internal_analytics/internal_event_instrumentation/event_definition_guide.md
index 64c688f50ff..c863288c7b2 100644
--- a/doc/development/internal_analytics/internal_event_instrumentation/event_definition_guide.md
+++ b/doc/development/internal_analytics/internal_event_instrumentation/event_definition_guide.md
@@ -40,7 +40,6 @@ Each event is defined in a separate YAML file consisting of the following fields
 | `identifiers`       | no       | A list of identifiers sent with the event. Can be set to one or more of `project`, `user`, `namespace` or `feature_enabled_by_namespace_ids`                                                                                                                                                                                     |
 | `product_group`     | yes      | The [group](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml) that owns the event.                                                                                                                                                                                                                       |
 | `product_categories`| false    | A list of the [feature categories](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/feature_categories.yml) that the event represents usage of. Some events may correspond to multiple categories or no category. |
-
 | `milestone`         | no       | The milestone when the event is introduced.                                                                                                                                                                                                                                                                                      |
 | `status`            | no       | The status of the event. Can be set to one of `active`, `removed`, or `null`.                                                                                                                                                                                                                                                  |
 | `milestone_removed` | no       | The milestone when the event is removed.                                                                                                                                                                                                                                                                                        |
diff --git a/doc/topics/git/get_started.md b/doc/topics/git/get_started.md
index ef2eb89cfdb..3a14b4c252d 100644
--- a/doc/topics/git/get_started.md
+++ b/doc/topics/git/get_started.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn about the Git version control system.
+description: Work with the Git version control system.
 title: Get started with Git
 ---
 
diff --git a/doc/user/application_security/get-started-security.md b/doc/user/application_security/get-started-security.md
index e1623f53f73..af396f8830c 100644
--- a/doc/user/application_security/get-started-security.md
+++ b/doc/user/application_security/get-started-security.md
@@ -2,7 +2,7 @@
 stage: Application Security Testing
 group: Secret Detection
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn about testing and resolving vulnerabilities.
+description: Test your application and resolve vulnerabilities.
 title: Get started securing your application
 ---
 
diff --git a/doc/user/get_started/get_started_deploy_release.md b/doc/user/get_started/get_started_deploy_release.md
index 64f48dbb324..7a5b6a341f9 100644
--- a/doc/user/get_started/get_started_deploy_release.md
+++ b/doc/user/get_started/get_started_deploy_release.md
@@ -2,7 +2,7 @@
 stage: none
 group: none
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to deploy and manage dependencies.
+description: Deploy and manage dependencies.
 title: Get started deploying and releasing your application
 ---
 
diff --git a/doc/user/get_started/get_started_managing_code.md b/doc/user/get_started/get_started_managing_code.md
index 00bac7f8351..26670aa7994 100644
--- a/doc/user/get_started/get_started_managing_code.md
+++ b/doc/user/get_started/get_started_managing_code.md
@@ -2,7 +2,7 @@
 stage: Create
 group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to build, track, and deliver the code for your project.
+description: Build, track, and deliver the code for your project.
 title: Get started managing code
 ---
 
diff --git a/doc/user/get_started/get_started_managing_infrastructure.md b/doc/user/get_started/get_started_managing_infrastructure.md
index df583c18a85..2de2321aeac 100644
--- a/doc/user/get_started/get_started_managing_infrastructure.md
+++ b/doc/user/get_started/get_started_managing_infrastructure.md
@@ -2,7 +2,7 @@
 stage: Deploy
 group: Environments
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to employ best practices for managing your infrastructure.
+description: Employ best practices for managing your infrastructure.
 title: Get started managing your infrastructure
 ---
 
diff --git a/doc/user/get_started/get_started_monitoring.md b/doc/user/get_started/get_started_monitoring.md
index 860770a1a63..55f7da37498 100644
--- a/doc/user/get_started/get_started_monitoring.md
+++ b/doc/user/get_started/get_started_monitoring.md
@@ -2,7 +2,7 @@
 stage: Monitor
 group: Platform Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to monitor your app and respond to incidents.
+description: Monitor your app and respond to incidents.
 title: Get started with monitoring your application in GitLab
 ---
 
diff --git a/doc/user/get_started/get_started_planning_work.md b/doc/user/get_started/get_started_planning_work.md
index d4f42bb7e00..240a7edaeaf 100644
--- a/doc/user/get_started/get_started_planning_work.md
+++ b/doc/user/get_started/get_started_planning_work.md
@@ -2,7 +2,7 @@
 stage: Plan
 group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to plan and execute on work.
+description: Plan and execute on work.
 title: Get started planning work
 ---
 
diff --git a/doc/user/get_started/get_started_projects.md b/doc/user/get_started/get_started_projects.md
index d50e3e45adf..ef406a3de8b 100644
--- a/doc/user/get_started/get_started_projects.md
+++ b/doc/user/get_started/get_started_projects.md
@@ -2,7 +2,7 @@
 stage: Tenant Scale
 group: Organizations
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to configure projects to suit your organization.
+description: Configure projects to suit your organization.
 title: Get started organizing work with projects
 ---
 
diff --git a/doc/user/get_started/get_started_runner.md b/doc/user/get_started/get_started_runner.md
index d97a7210bda..640460aa45a 100644
--- a/doc/user/get_started/get_started_runner.md
+++ b/doc/user/get_started/get_started_runner.md
@@ -2,7 +2,7 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to set up and manage GitLab Runner.
+description: Set up and manage GitLab Runner.
 title: Get started with GitLab Runner
 ---
 
diff --git a/doc/user/get_started/getting_started_gitlab_duo.md b/doc/user/get_started/getting_started_gitlab_duo.md
index e2796a09c7a..d14e5df5bbe 100644
--- a/doc/user/get_started/getting_started_gitlab_duo.md
+++ b/doc/user/get_started/getting_started_gitlab_duo.md
@@ -2,7 +2,7 @@
 stage: AI-powered
 group: AI Framework
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
-description: Learn how to use the AI-native assistant.
+description: Use the AI-native assistant throughout your lifecycle.
 title: Get started with GitLab Duo
 ---
 
diff --git a/doc/user/gitlab_duo/context.md b/doc/user/gitlab_duo/context.md
index a2a782db792..dae4e7615ac 100644
--- a/doc/user/gitlab_duo/context.md
+++ b/doc/user/gitlab_duo/context.md
@@ -34,7 +34,7 @@ When you have any of these resources open, GitLab Duo knows about them.
 - Code selected in a file
 - Issues (GitLab Duo Enterprise only)
 - Epics (GitLab Duo Enterprise only)
-- Work items (GitLab Duo Enterprise only)
+- [Other work item types](../work_items/_index.md#work-item-types) (GitLab Duo Enterprise only)
 
 {{< alert type="note" >}}
 
diff --git a/doc/user/group/_index.md b/doc/user/group/_index.md
index 47911c5feac..73c3f611e71 100644
--- a/doc/user/group/_index.md
+++ b/doc/user/group/_index.md
@@ -266,7 +266,8 @@ You can also delete a group from the groups dashboard:
 1. In the **Delete group** section, select **Delete group**.
 1. On the confirmation dialog, type the group name and select **Confirm**.
 
-This action adds a background job to mark a group for deletion. By default, the job schedules the deletion seven days in the future. You can modify this retention period through the [instance settings](../../administration/settings/visibility_and_access_controls.md#deletion-protection).
+This action adds a background job to mark a group for deletion. On GitLab.com, the group is deleted after 30 days. On GitLab Self-Managed,
+you can modify the retention period through the [instance settings](../../administration/settings/visibility_and_access_controls.md#deletion-protection).
 
 If the user who scheduled the group deletion loses access to the group (for example, by leaving the group, having their role downgraded, or being banned from the group) before the deletion occurs,
 the deletion job will instead restore and unarchive the group, so the group will no longer be scheduled for deletion.
diff --git a/lib/api/composer_packages.rb b/lib/api/composer_packages.rb
index 5840ae8db72..86fab15f5bb 100644
--- a/lib/api/composer_packages.rb
+++ b/lib/api/composer_packages.rb
@@ -35,7 +35,12 @@ module API
     helpers do
       def packages
         strong_memoize(:packages) do
-          packages = ::Packages::Composer::PackagesFinder.new(current_user, find_authorized_group!).execute
+          group = find_authorized_group!
+          packages = if Feature.enabled?(:packages_composer_finder_refactor, group)
+                       ::Packages::Composer::PackageFinder.new(current_user, group).execute
+                     else
+                       ::Packages::Composer::PackagesFinder.new(current_user, group).execute
+                     end
 
           if params[:package_name].present?
             params[:package_name], params[:sha] = params[:package_name].split('$')
@@ -210,11 +215,19 @@ module API
           project = authorized_user_project(action: :read_package)
           authorize_job_token_policies!(project)
 
-          package = ::Packages::Composer::Package
-            .for_projects(project)
-            .with_name(params[:package_name])
-            .with_composer_target(params[:sha])
-            .first
+          package = if Feature.enabled?(:packages_composer_finder_refactor, project.root_ancestor)
+                      ::Packages::Composer::PackageFinder
+                        .new(current_user, project, { package_name: params[:package_name], target_sha: params[:sha] })
+                        .execute
+                        .first
+                    else
+                      ::Packages::Composer::Package
+                        .for_projects(project)
+                        .with_name(params[:package_name])
+                        .with_composer_target(params[:sha])
+                        .first
+                    end
+
           metadata = package&.composer_metadatum
 
           not_found! unless metadata
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6adce1f27a7..eece68bb055 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1619,9 +1619,6 @@ msgstr ""
 msgid "%{url} (optional)"
 msgstr ""
 
-msgid "%{userName}'s avatar"
-msgstr ""
-
 msgid "%{user_link} added this OAuth application "
 msgstr ""
 
@@ -69525,6 +69522,9 @@ msgstr ""
 msgid "VulnerabilityManagement|Identifier code and URL are required fields"
 msgstr ""
 
+msgid "VulnerabilityManagement|Last checked:"
+msgstr ""
+
 msgid "VulnerabilityManagement|Manually add a vulnerability entry into the vulnerability report."
 msgstr ""
 
@@ -69543,6 +69543,9 @@ msgstr ""
 msgid "VulnerabilityManagement|Requires assessment"
 msgstr ""
 
+msgid "VulnerabilityManagement|Retry"
+msgstr ""
+
 msgid "VulnerabilityManagement|Select a method"
 msgstr ""
 
@@ -69618,6 +69621,9 @@ msgstr ""
 msgid "VulnerabilityManagement|invalid issue link or ID"
 msgstr ""
 
+msgid "VulnerabilityManagement|not available"
+msgstr ""
+
 msgid "VulnerabilityStatusTypes|Confirmed"
 msgstr ""
 
diff --git a/package.json b/package.json
index 503bebf5f12..eb3110753ef 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language-rust": "0.13.1",
     "@gitlab/svgs": "3.142.0",
-    "@gitlab/ui": "115.6.1",
+    "@gitlab/ui": "115.7.0",
     "@gitlab/vue-router-vue3": "npm:vue-router@4.5.1",
     "@gitlab/vuex-vue3": "npm:vuex@4.1.0",
     "@gitlab/web-ide": "^0.0.1-dev-20250716135712",
diff --git a/qa/qa/tools/delete_resource_base.rb b/qa/qa/tools/delete_resource_base.rb
index d329f5ba321..169b3f3ad35 100644
--- a/qa/qa/tools/delete_resource_base.rb
+++ b/qa/qa/tools/delete_resource_base.rb
@@ -39,8 +39,8 @@ module QA
       # @param [Hash] resource
       # @return [Array<String, Hash>] results
       def delete_permanently(resource)
-        # We need to get the path_with_namespace of the project again since marking it for deletion changes the name
-        resource = get_resource(resource) if @type.include?('project')
+        # Get the path of the project or group again since marking it for deletion changes the name
+        resource = get_resource(resource) if @type.include?('project') || @type.include?('group')
         return unless resource
 
         path = resource_path(resource)
diff --git a/qa/qa/tools/test_resources_handler.rb b/qa/qa/tools/test_resources_handler.rb
index e20a63dd08e..b6136c0ae4d 100644
--- a/qa/qa/tools/test_resources_handler.rb
+++ b/qa/qa/tools/test_resources_handler.rb
@@ -262,12 +262,15 @@ module QA
       end
 
       def get_full_path(resource, type)
-        # We need to get the full path of the project again since marking it for deletion changes the name
-        if type == 'project'
+        # Get the full path of the project or group again since marking it for deletion changes the name
+        if type == 'project' || type == 'group'
           response = get_resource(resource['api_path'])
-          if success?(response&.code)
+          if success?(response&.code) && type == 'project'
             project = parse_body(response)
             project[:path_with_namespace]
+          elsif success?(response&.code) && type == 'group'
+            group = parse_body(response)
+            group[:full_path]
           end
         else
           resource['info'].split("'").last
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 5762dc66f1d..e4da19afbfa 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -274,7 +274,7 @@ RSpec.describe 'Database schema',
       instance_type_ci_runners: 18,
       issues: 35,
       members: 21,
-      merge_requests: 33,
+      merge_requests: 32,
       namespaces: 26,
       notes: 16,
       p_ci_builds: 26,
diff --git a/spec/finders/packages/composer/package_finder_spec.rb b/spec/finders/packages/composer/package_finder_spec.rb
new file mode 100644
index 00000000000..d495f1f179a
--- /dev/null
+++ b/spec/finders/packages/composer/package_finder_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ::Packages::Composer::PackageFinder, feature_category: :package_registry do
+  describe '#execute' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project) { create(:project, namespace: group) }
+    let_it_be(:target_sha) { OpenSSL::Digest.hexdigest('SHA1', FFaker::Lorem.word) }
+    let_it_be(:package) { create(:composer_package, :with_metadatum, project: project) }
+
+    let_it_be(:package3) do
+      create(:composer_package, :with_metadatum, project: project, sha: target_sha, name: package.name)
+    end
+
+    let(:project_or_group) { project }
+    let(:params) { {} }
+
+    before_all do
+      create(:composer_package, :with_metadatum)
+    end
+
+    subject(:result) { described_class.new(user, project_or_group, params).execute }
+
+    shared_examples 'filtering by parameters' do
+      context 'when parameters are provided' do
+        let(:params) { { package_name: package.name, target_sha: target_sha } }
+
+        it { is_expected.to contain_exactly(package3) }
+      end
+    end
+
+    it { is_expected.to contain_exactly(package, package3) }
+
+    it_behaves_like 'filtering by parameters'
+
+    context 'when group is provided' do
+      let(:project_or_group) { group }
+
+      it { is_expected.to be_empty }
+
+      context 'when user has permissions' do
+        before_all do
+          group.add_reporter(user)
+        end
+
+        it { is_expected.to contain_exactly(package, package3) }
+
+        it_behaves_like 'filtering by parameters'
+      end
+    end
+  end
+end
diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
index 1a0bdbef9f9..42b517efb83 100644
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
-import { GlAvatar } from '@gitlab/ui';
+import { GlAvatar, GlIcon } from '@gitlab/ui';
 import { TEST_HOST } from 'helpers/test_constants';
 import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue';
 import userDataMock from '../../user_data_mock';
@@ -28,11 +28,12 @@ describe('AssigneeAvatar', () => {
   });
 
   const findAvatar = () => wrapper.findComponent(GlAvatar);
+  const findIcon = () => wrapper.findComponent(GlIcon);
 
   it('does not show warning icon if assignee can merge', () => {
     createComponent();
 
-    expect(wrapper.find('.merge-icon').exists()).toBe(false);
+    expect(findIcon().exists()).toBe(false);
   });
 
   it('shows warning icon if assignee cannot merge', () => {
@@ -42,7 +43,7 @@ describe('AssigneeAvatar', () => {
       },
     });
 
-    expect(wrapper.find('.merge-icon').exists()).toBe(true);
+    expect(findIcon().exists()).toBe(true);
   });
 
   it('does not show warning icon for issuableType = "issue"', () => {
@@ -50,7 +51,7 @@ describe('AssigneeAvatar', () => {
       issuableType: 'issue',
     });
 
-    expect(wrapper.find('.merge-icon').exists()).toBe(false);
+    expect(findIcon().exists()).toBe(false);
   });
 
   it.each`
diff --git a/spec/frontend/sidebar/components/assignees/assignees_spec.js b/spec/frontend/sidebar/components/assignees/assignees_spec.js
index 2b48ed815fe..e8698ad985b 100644
--- a/spec/frontend/sidebar/components/assignees/assignees_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignees_spec.js
@@ -80,7 +80,6 @@ describe('Assignee component', () => {
 
       expect(collapsedChildren).toHaveLength(1);
       expect(assignee.findComponent(GlAvatar).props('src')).toBe(UsersMock.user.avatar);
-      expect(assignee.findComponent(GlAvatar).props('alt')).toBe(`${UsersMock.user.name}'s avatar`);
 
       expect(trimText(assignee.find('.author').text())).toBe(UsersMock.user.name);
     });
@@ -101,14 +100,12 @@ describe('Assignee component', () => {
       const first = collapsedChildren.at(0);
 
       expect(first.findComponent(GlAvatar).props('src')).toBe(users[0].avatar_url);
-      expect(first.findComponent(GlAvatar).props('alt')).toBe(`${users[0].name}'s avatar`);
 
       expect(trimText(first.find('.author').text())).toBe(users[0].name);
 
       const second = collapsedChildren.at(1);
 
       expect(second.findComponent(GlAvatar).props('src')).toBe(users[1].avatar_url);
-      expect(second.findComponent(GlAvatar).props('alt')).toBe(`${users[1].name}'s avatar`);
 
       expect(trimText(second.find('.author').text())).toBe(users[1].name);
     });
@@ -127,7 +124,6 @@ describe('Assignee component', () => {
       const first = collapsedChildren.at(0);
 
       expect(first.findComponent(GlAvatar).props('src')).toBe(users[0].avatar_url);
-      expect(first.findComponent(GlAvatar).props('alt')).toBe(`${users[0].name}'s avatar`);
 
       expect(trimText(first.find('.author').text())).toBe(users[0].name);
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 044ad057359..32a91235449 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -260,6 +260,16 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep, feature_category:
       end
     end
 
+    context 'from running to manual' do
+      let_it_be(:pipeline) { create(:ci_pipeline, :running) }
+
+      it 'schedules CoverageReportWorker' do
+        expect(Ci::PipelineArtifacts::CoverageReportWorker).to receive(:perform_async).with(pipeline.id)
+
+        pipeline.block!
+      end
+    end
+
     describe 'to completed' do
       # need pre-created object to avoid another InternalEvent being triggers in the models create hook
       let!(:pipeline) { create(:ci_empty_pipeline, user: user, project: project) }
@@ -4507,24 +4517,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep, feature_category:
     end
   end
 
-  describe '#self_and_project_descendants_complete?' do
-    let_it_be(:pipeline) { create(:ci_pipeline, :success) }
-    let_it_be(:child_pipeline) { create(:ci_pipeline, :success, child_of: pipeline) }
-    let_it_be_with_reload(:grandchild_pipeline) { create(:ci_pipeline, :success, child_of: child_pipeline) }
-
-    context 'when all pipelines in the hierarchy is complete' do
-      it { expect(pipeline.self_and_project_descendants_complete?).to be(true) }
-    end
-
-    context 'when a pipeline in the hierarchy is not complete' do
-      before do
-        grandchild_pipeline.update!(status: :running)
-      end
-
-      it { expect(pipeline.self_and_project_descendants_complete?).to be(false) }
-    end
-  end
-
   describe '#builds_in_self_and_project_descendants' do
     subject(:builds) { pipeline.builds_in_self_and_project_descendants }
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 81ad36a5eae..58f689e74e5 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -332,14 +332,6 @@ RSpec.describe MergeRequest, factory_default: :keep, feature_category: :code_rev
       end
     end
 
-    describe '.recently_unprepared' do
-      it 'only returns the recently unprepared mrs' do
-        merge_request5 = create(:merge_request, :unprepared, :unique_branches, created_at: merge_request3.created_at)
-
-        expect(described_class.recently_unprepared).to eq([merge_request3, merge_request5])
-      end
-    end
-
     describe '.distinct_source_branches' do
       let_it_be(:project) { create(:project, :repository) }
       let_it_be(:mr1) { create(:merge_request, source_branch: 'feature-1', source_project: project) }
diff --git a/spec/requests/api/composer_packages_spec.rb b/spec/requests/api/composer_packages_spec.rb
index 40fc90c40f4..654554c1a30 100644
--- a/spec/requests/api/composer_packages_spec.rb
+++ b/spec/requests/api/composer_packages_spec.rb
@@ -63,6 +63,16 @@ RSpec.describe API::ComposerPackages, feature_category: :package_registry do
               it_behaves_like 'Composer package index', member_role: params[:member_role], expected_status: :success, package_returned: params[:package_returned]
             end
           end
+
+          context 'when packages_composer_finder_refactor is disabled' do
+            before do
+              stub_feature_flags(packages_composer_finder_refactor: false)
+            end
+
+            include_context 'Composer api project access', auth_method: :basic, project_visibility_level: 'PUBLIC', token_type: :user, valid_token: true do
+              it_behaves_like 'Composer package index', member_role: :developer, expected_status: :success, package_returned: true
+            end
+          end
         end
 
         context 'with token auth' do
@@ -187,6 +197,16 @@ RSpec.describe API::ComposerPackages, feature_category: :package_registry do
             it_behaves_like params[:shared_examples_name], member_role: params[:member_role], expected_status: params[:expected_status]
           end
         end
+
+        context 'when packages_composer_finder_refactor is disabled' do
+          before do
+            stub_feature_flags(packages_composer_finder_refactor: false)
+          end
+
+          include_context 'Composer api group access', auth_method: :basic, project_visibility_level: 'PUBLIC', token_type: :user, valid_token: true do
+            it_behaves_like 'Composer provider index', member_role: :developer, expected_status: :success
+          end
+        end
       end
 
       context 'with token auth' do
@@ -271,6 +291,16 @@ RSpec.describe API::ComposerPackages, feature_category: :package_registry do
             it_behaves_like params[:shared_examples_name], member_role: params[:member_role], expected_status: params[:expected_status]
           end
         end
+
+        context 'when packages_composer_finder_refactor is disabled' do
+          before do
+            stub_feature_flags(packages_composer_finder_refactor: false)
+          end
+
+          include_context 'Composer api group access', auth_method: :basic, project_visibility_level: 'PUBLIC', token_type: :user, valid_token: true do
+            it_behaves_like 'Composer package api request', member_role: :developer, expected_status: :success
+          end
+        end
       end
 
       context 'with token auth' do
@@ -362,6 +392,16 @@ RSpec.describe API::ComposerPackages, feature_category: :package_registry do
             it_behaves_like params[:shared_examples_name], member_role: params[:member_role], expected_status: params[:expected_status]
           end
         end
+
+        context 'when packages_composer_finder_refactor is disabled' do
+          before do
+            stub_feature_flags(packages_composer_finder_refactor: false)
+          end
+
+          include_context 'Composer api group access', auth_method: :basic, project_visibility_level: 'PUBLIC', token_type: :user, valid_token: true do
+            it_behaves_like 'Composer package api request', member_role: :developer, expected_status: :success
+          end
+        end
       end
 
       context 'with token auth' do
@@ -658,6 +698,16 @@ RSpec.describe API::ComposerPackages, feature_category: :package_registry do
               end
             end
           end
+
+          context 'when packages_composer_finder_refactor is disabled' do
+            before do
+              stub_feature_flags(packages_composer_finder_refactor: false)
+            end
+
+            include_context 'Composer api project access', auth_method: :basic, project_visibility_level: 'PUBLIC', token_type: :user, valid_token: true do
+              it_behaves_like 'process Composer api request', member_role: :developer, expected_status: :success
+            end
+          end
         end
 
         context 'with token auth' do
diff --git a/spec/workers/ci/pipeline_artifacts/coverage_report_worker_spec.rb b/spec/workers/ci/pipeline_artifacts/coverage_report_worker_spec.rb
index a7624fdfe01..fdf3e327065 100644
--- a/spec/workers/ci/pipeline_artifacts/coverage_report_worker_spec.rb
+++ b/spec/workers/ci/pipeline_artifacts/coverage_report_worker_spec.rb
@@ -40,9 +40,7 @@ RSpec.describe Ci::PipelineArtifacts::CoverageReportWorker, feature_category: :c
       end
 
       context 'when the pipeline hierarchy has incomplete pipeline' do
-        before do
-          another_child_pipeline.update!(status: :running)
-        end
+        let_it_be(:another_child_pipeline) { create(:ci_pipeline, :running, child_of: root_ancestor_pipeline) }
 
         it 'does not call pipeline coverage report service' do
           expect(Ci::PipelineArtifacts::CoverageReportService).not_to receive(:new)
@@ -50,6 +48,18 @@ RSpec.describe Ci::PipelineArtifacts::CoverageReportWorker, feature_category: :c
           subject
         end
       end
+
+      context 'when the pipeline hierarchy has manual pipelines' do
+        let_it_be(:another_child_pipeline) { create(:ci_pipeline, :blocked, child_of: root_ancestor_pipeline) }
+
+        it 'calls pipeline coverage report service' do
+          expect_next_instance_of(::Ci::PipelineArtifacts::CoverageReportService, root_ancestor_pipeline) do |service|
+            expect(service).to receive(:execute)
+          end
+
+          subject
+        end
+      end
     end
 
     context 'when pipeline does not exist' do
diff --git a/yarn.lock b/yarn.lock
index 415def84fab..66c2b4b67bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1449,10 +1449,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.142.0.tgz#525092e432d00dc8d6554eba20bb80c6316eec79"
   integrity sha512-0yZq45G7SvDwY9nfQ5APhtxqaYS1hvcdtRxPEIzLv5g5UZoslIr7fTcg2r45987NS24FegjdDId2XLJXe6F5eQ==
 
-"@gitlab/ui@115.6.1":
-  version "115.6.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-115.6.1.tgz#df0f5f84666d1e2c3d518c14b59c06cffbd6ae88"
-  integrity sha512-zbK5jNkIYYqXEAqbwniRgGWbBhOdGUvOvg+StshEfy2+OeNydKMeoydJy19LYp+/1uOHb/JwAZZmdIwug4UXwQ==
+"@gitlab/ui@115.7.0":
+  version "115.7.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-115.7.0.tgz#70a9fa56cd9996227782b51ca9484f5e46d56d46"
+  integrity sha512-cgYXPZmreWD8A9wUY5275vSA5iLWGPdV64x+d9rYpt992ZZsuoqy/nBNE863G3DvkSXvAtDLl5wstazaiesU0g==
   dependencies:
     "@floating-ui/dom" "1.7.2"
     echarts "^5.6.0"