diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca46e7c7bb5..35064e89941 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,7 +220,7 @@ variables:
   DOCS_REVIEW_APPS_DOMAIN: "docs.gitlab-review.app"
   DOCS_GITLAB_REPO_SUFFIX: "ee"
 
-  REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bookworm-ruby-3.1:gcloud-383-kubectl-1.26-helm-3.9"
+  REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bookworm-ruby-3.0:gcloud-383-kubectl-1.26-helm-3.9"
   REVIEW_APPS_DOMAIN: "gitlab-review.app"
   REVIEW_APPS_GCP_PROJECT: "gitlab-review-apps"
   REVIEW_APPS_GCP_REGION: "us-central1"
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 0970dc56779..7560480ec8a 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -152,6 +152,9 @@
 .if-dot-com-gitlab-org-merge-request: &if-dot-com-gitlab-org-merge-request
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached")'
 
+.if-dot-com-gitlab-org-ee-tag: &if-dot-com-gitlab-org-ee-tag
+  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab" && $CI_COMMIT_TAG =~ /^v?[\d]+\.[\d]+\.[\d]+[\d\w-]*-ee$/'
+
 .if-ruby-branch: &if-ruby-branch
   if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ || $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/'
 
@@ -3324,6 +3327,8 @@
       when: never
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
+    - <<: *if-dot-com-gitlab-org-ee-tag
+      when: always
     - !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only", rules]
 
 ###################
diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md
index 477efe47ce0..af6073ee4df 100644
--- a/.gitlab/merge_request_templates/Deprecations.md
+++ b/.gitlab/merge_request_templates/Deprecations.md
@@ -6,7 +6,7 @@
 
 If there is no relevant deprecation issue, hit pause and:
 
-- Review the [process for deprecating and removing features](https://about.gitlab.com/handbook/product/gitlab-the-product/#process-for-deprecating-and-removing-a-feature).
+- Review the [process for deprecating and removing features](https://handbook.gitlab.com/handbook/product/gitlab-the-product/#process-for-deprecating-and-removing-a-feature).
 - Connect with the Product Manager DRI.
 
 Deprecation announcements can and should be created and merged into Docs at any time, to optimize user awareness and planning. We encourage confirmed deprecations to be merged as soon as the required reviews are complete, even if weeks ahead of the target milestone's release post. For the announcement to be included in a specific release post and that release's documentation packages, this MR must be reviewed/merged per the due dates below:
@@ -29,16 +29,16 @@ Please review:
 
 - The definitions of ["Deprecation", "End of Support", and "Removal"](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
 - The [guidelines for deprecations](https://handbook.gitlab.com/handbook/marketing/blog/release-posts/#deprecations-removals-and-breaking-changes).
-- The process for [creating a deprecation announcement](https://about.gitlab.com/handbook/marketing/blog/release-posts/#creating-the-announcement).
+- The process for [creating a deprecation announcement](https://handbook.gitlab.com/handbook/marketing/blog/release-posts/#creating-the-announcement).
 
 They are frequently updated, and everyone should make sure they are aware of the current standards (PM, PMM, EM, and TW).
 
 ## EM/PM release post item checklist
 
 - [ ] Set yourself as the Assignee, meaning you are the DRI.
-- [ ] If the deprecation is a [breaking change](https://about.gitlab.com/handbook/product/gitlab-the-product/#breaking-change), add label `breaking change`.
+- [ ] If the deprecation is a [breaking change](https://handbook.gitlab.com/handbook/product/gitlab-the-product/#breaking-changes), add label `breaking change`.
 - [ ] Confirm this MR is labeled ~"release post item::deprecation"
-- [ ] Follow the process to [create a deprecation YAML file](https://about.gitlab.com/handbook/marketing/blog/release-posts/#creating-the-announcement).
+- [ ] Follow the process to [create a deprecation YAML file](https://handbook.gitlab.com/handbook/marketing/blog/release-posts/#creating-the-announcement).
 - [ ] Add reviewers by the 10th.
 - [ ] Add scoped `devops::` and `group::` labels as necessary.
 - [ ] Add the appropriate milestone to this MR.
@@ -77,7 +77,7 @@ yourself as a reviewer if it's not ready for merge yet.
 - [ ] Content:
   - Make sure the deprecation is accurate based on your understanding. Look for typos or grammar mistakes. Work with PM and PMM to ensure a consistent GitLab style and tone for messaging, based on other features and deprecations.
   - Review use of whitespace and bullet lists. Will the deprecation item be easily scannable when published? Consider adding line breaks or breaking content into bullets if you have more than a few sentences.
-  - Make sure there aren't acronyms readers may not understand per <https://about.gitlab.com/handbook/communication/#writing-style-guidelines>.
+  - Make sure there aren't acronyms readers may not understand per [our Writing style guidelines](https://handbook.gitlab.com/handbook/communication/#writing-style-guidelines).
 - [ ] Links:
   - All links must be full URLs, as the deprecation YAML files are used in two different projects. Do not use relative links. The generated doc is an exception to the relative link rule and currently uses absolute links only.
   - Make sure all links and anchors are correct. Do not link to the H1 (top) anchor on a docs page.
@@ -101,7 +101,7 @@ must be updated before this MR is merged:
 1. Commit the updated file and push the changes.
 1. Set the merge request to auto-merge, or if the pipeline is already complete, merge.
 
-If you have trouble running the Rake task, check the [troubleshooting steps](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting).
+If you have trouble running the Rake task, check the [troubleshooting steps](https://handbook.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting).
 
 /label ~"release post" ~"release post item" ~"Technical Writing" ~"release post item::deprecation"
 /label ~"type::maintenance"
diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md
index f0756cea718..10843334aff 100644
--- a/.gitlab/merge_request_templates/Documentation.md
+++ b/.gitlab/merge_request_templates/Documentation.md
@@ -10,7 +10,7 @@
 
 ## Author's checklist
 
-- [ ] Optional. Consider taking [the GitLab Technical Writing Fundamentals course](https://about.gitlab.com/handbook/product/ux/technical-writing/fundamentals/).
+- [ ] Optional. Consider taking [the GitLab Technical Writing Fundamentals course](https://handbook.gitlab.com/handbook/product/ux/technical-writing/fundamentals/).
 - [ ] Follow the:
   - [Documentation process](https://docs.gitlab.com/ee/development/documentation/workflow.html).
   - [Documentation guidelines](https://docs.gitlab.com/ee/development/documentation/).
diff --git a/.gitlab/merge_request_templates/New End To End Test.md b/.gitlab/merge_request_templates/New End To End Test.md
index 9a42cf2a6d9..5d6497c0d49 100644
--- a/.gitlab/merge_request_templates/New End To End Test.md	
+++ b/.gitlab/merge_request_templates/New End To End Test.md	
@@ -34,7 +34,7 @@ to run locally against GDK.
   - [ ] New resources have `api_get_path` and `api_delete_path` implemented if possible.
   - [ ] If any resource cannot be deleted in the general delete task, make sure it is [ignored](https://gitlab.com/gitlab-org/gitlab/-/blob/44345381e89d6bbd440f7b4c680d03e8b75b86de/qa/qa/tools/test_resources_handler.rb#L29).
   - [ ] If any resource cannot be deleted in the general delete task, remove it in the test (e.g., in an `after` block).
-- [ ] Ensure that no [transient bugs](https://about.gitlab.com/handbook/engineering/quality/issue-triage/#transient-bugs) are hidden accidentally due to the usage of `waits` and `reloads`.
+- [ ] Ensure that no [transient bugs](https://handbook.gitlab.com/handbook/engineering/infrastructure/engineering-productivity/issue-triage/#transient-bugs) are hidden accidentally due to the usage of `waits` and `reloads`.
 - [ ] Verify the tags to ensure it runs on the desired test environments.
 - [ ] If this MR has a dependency on another MR, such as a GitLab QA MR, specify the order in which the MRs should be merged.
 - [ ] (If applicable) Create a follow-up issue to document [the special setup](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/running_tests_that_require_special_setup.html) necessary to run the test: ISSUE_LINK
diff --git a/.gitlab/merge_request_templates/New Static Analysis Check.md b/.gitlab/merge_request_templates/New Static Analysis Check.md
index 9cf21fa49e8..25217145422 100644
--- a/.gitlab/merge_request_templates/New Static Analysis Check.md	
+++ b/.gitlab/merge_request_templates/New Static Analysis Check.md	
@@ -18,7 +18,7 @@ Please describe the proposal and add a link to the source (for example, http://w
   - CHOICE_A: :a:
   - CHOICE_B: :b:
   - Vote for both choices, so they are visible to others.
-- [ ] The MR doesn't have significant objections, and is getting a majority of :+1: vs :-1: (remember that [we don't need to reach a consensus](https://about.gitlab.com/handbook/values/#collaboration-is-not-consensus)).
+- [ ] The MR doesn't have significant objections, and is getting a majority of :+1: vs :-1: (remember that [we don't need to reach a consensus](https://handbook.gitlab.com/handbook/values/#collaboration-is-not-consensus)).
 - [ ] (If applicable) One style is getting a majority of vote (compared to the other choice).
 - [ ] (If applicable) Update the MR with the chosen style.
 - [ ] Create a follow-up issue to fix the current offenses as a separate iteration: ISSUE_LINK
diff --git a/.gitlab/merge_request_templates/Pipeline Configuration.md b/.gitlab/merge_request_templates/Pipeline Configuration.md
index 255cb787d64..df698cc6ec5 100644
--- a/.gitlab/merge_request_templates/Pipeline Configuration.md	
+++ b/.gitlab/merge_request_templates/Pipeline Configuration.md	
@@ -21,7 +21,7 @@ Consider the effect of the changes in this merge request on the following:
   - [ ] `security`
   - [ ] `dev`
   - [ ] personal forks
-- [ ] [Pipeline performance](https://about.gitlab.com/handbook/engineering/quality/performance-indicators/#average-merge-request-pipeline-duration-for-gitlab)
+- [ ] [Pipeline performance](https://docs.gitlab.com/ee/ci/pipelines/pipeline_efficiency.html)
 
 **If new jobs are added:**
 
@@ -29,10 +29,10 @@ Consider the effect of the changes in this merge request on the following:
 - [ ] Frequency they are running (MRs, main branch, nightly, bi-hourly): _____
 - [ ] Add a duration chart to https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations if there are new jobs added to merge request pipelines
 
-This will help keep track of expected cost increases to the [GitLab project average pipeline cost per merge request](https://about.gitlab.com/handbook/engineering/quality/performance-indicators/#gitlab-project-average-pipeline-cost-per-merge-request) RPI
+This will help keep track of expected pipeline time and cost increases.
 
 ### Post-merge
 
-- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes)
+- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://handbook.gitlab.com/handbook/engineering/infrastructure/engineering-productivity/#pipeline-changes)
 
 /label ~"maintenance::pipelines" ~"Engineering Productivity"
diff --git a/.gitlab/merge_request_templates/Revert To Resolve Incident.md b/.gitlab/merge_request_templates/Revert To Resolve Incident.md
index 9f8c42ac67c..cbf708447e9 100644
--- a/.gitlab/merge_request_templates/Revert To Resolve Incident.md	
+++ b/.gitlab/merge_request_templates/Revert To Resolve Incident.md	
@@ -11,7 +11,7 @@
 ### Checklist
 
 - [ ] Create an issue to reinstate the merge request and assign it to the author of the reverted merge request.
-- [ ] If the revert is to resolve a [broken 'master' incident](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), please read through the [Responsibilities of the Broken `master` resolution DRI](https://about.gitlab.com/handbook/engineering/workflow/#responsibilities-of-the-resolution-dri).
+- [ ] If the revert is to resolve a [broken 'master' incident](https://handbook.gitlab.com/handbook/engineering/workflow/#broken-master), please read through the [Responsibilities of the Broken `master` resolution DRI](https://handbook.gitlab.com/handbook/engineering/workflow/#responsibilities-of-the-resolution-dri).
 - [ ] If the revert involves a database migration, please read through [Deleting existing migrations](https://docs.gitlab.com/ee/development/database/deleting_migrations.html).
 - [ ] Add the appropriate labels **before** the MR is created. We can skip CI/CD jobs only if the labels are added **before** the CI/CD pipeline is created.
 
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index e7827f1d82c..1126e08f814 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -39,7 +39,6 @@ Style/FormatString:
     - 'app/helpers/groups/group_members_helper.rb'
     - 'app/helpers/groups_helper.rb'
     - 'app/helpers/import_helper.rb'
-    - 'app/helpers/invite_members_helper.rb'
     - 'app/helpers/issuables_helper.rb'
     - 'app/helpers/issues_helper.rb'
     - 'app/helpers/members_helper.rb'
diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
index 5eea12de477..26eb09c4c43 100644
--- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
+++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
@@ -75,7 +75,7 @@ export default {
 </script>
 <template>
   <div
-    class="gl-w-full gl-py-3 gl-row-gap-2 gl-display-flex gl-align-items-center gl-flex-wrap gl-border-b gl-border-gray-100 gl-px-3 gl-rounded-top-base"
+    class="gl-w-full gl-py-3 gl-gap-y-2 gl-display-flex gl-align-items-center gl-flex-wrap gl-border-b gl-border-gray-100 gl-px-3 gl-rounded-top-base"
     data-testid="formatting-toolbar"
   >
     <div class="gl-display-flex">
diff --git a/app/assets/javascripts/error_tracking/components/error_details_info.vue b/app/assets/javascripts/error_tracking/components/error_details_info.vue
index 19c3b3f8f0c..4cb88ea9e83 100644
--- a/app/assets/javascripts/error_tracking/components/error_details_info.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details_info.vue
@@ -57,7 +57,7 @@ export default {
   <div>
     <div
       v-if="error"
-      class="gl-display-flex gl-flex-wrap gl-justify-content-center gl-my-7 gl-row-gap-6"
+      class="gl-display-flex gl-flex-wrap gl-justify-content-center gl-my-7 gl-gap-y-6"
     >
       <gl-card
         :class="$options.CARD_CLASS"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 80bda07dc62..7f962352268 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -265,9 +265,9 @@ export default {
     <div class="gl-display-flex gl-align-items-center gl-flex-wrap">
       <div
         data-testid="md-header-toolbar"
-        class="md-header-toolbar gl-display-flex gl-py-3 gl-row-gap-2 gl-flex-grow-1 gl-align-items-flex-start"
+        class="md-header-toolbar gl-display-flex gl-py-3 gl-gap-y-2 gl-flex-grow-1 gl-align-items-flex-start"
       >
-        <div class="gl-display-flex gl-flex-wrap gl-row-gap-2">
+        <div class="gl-display-flex gl-flex-wrap gl-gap-y-2">
           <gl-button
             v-if="enablePreview"
             data-testid="preview-toggle"
@@ -280,7 +280,7 @@ export default {
             >{{ previewMarkdown ? $options.i18n.hidePreview : $options.i18n.preview }}</gl-button
           >
           <template v-if="!previewMarkdown && canSuggest">
-            <div class="gl-display-flex gl-row-gap-2">
+            <div class="gl-display-flex gl-gap-y-2">
               <header-divider v-if="!previewMarkdown" />
               <toolbar-button
                 ref="suggestButton"
@@ -323,10 +323,10 @@ export default {
               </gl-popover>
             </div>
           </template>
-          <div class="gl-display-flex gl-row-gap-2">
+          <div class="gl-display-flex gl-gap-y-2">
             <div
               v-if="!previewMarkdown && editorAiActions.length"
-              class="gl-display-flex gl-row-gap-2"
+              class="gl-display-flex gl-gap-y-2"
             >
               <header-divider v-if="!previewMarkdown" />
               <ai-actions-dropdown
@@ -363,7 +363,7 @@ export default {
             icon="italic"
             tracking-property="italic"
           />
-          <div class="gl-display-flex gl-row-gap-2">
+          <div class="gl-display-flex gl-gap-y-2">
             <toolbar-button
               v-if="!restrictedToolBarItems.includes('strikethrough')"
               v-show="!previewMarkdown"
@@ -471,7 +471,7 @@ export default {
             icon="list-outdent"
             tracking-property="outdent"
           />
-          <div class="gl-display-flex gl-row-gap-2">
+          <div class="gl-display-flex gl-gap-y-2">
             <toolbar-button
               v-if="!restrictedToolBarItems.includes('collapsible-section')"
               v-show="!previewMarkdown"
diff --git a/app/assets/stylesheets/components/rapid_diffs/diff_file_component.scss b/app/assets/stylesheets/components/rapid_diffs/diff_file_component.scss
new file mode 100644
index 00000000000..befbcc83a33
--- /dev/null
+++ b/app/assets/stylesheets/components/rapid_diffs/diff_file_component.scss
@@ -0,0 +1,31 @@
+.rd-diff-file {
+  padding-bottom: $gl-padding;
+}
+
+.rd-diff-file-header {
+  display: flex;
+  background-color: $gray-light;
+  border: 1px solid $gray-100;
+  border-bottom: 1px solid $border-color;
+  padding: $gl-padding-8 $gl-padding;
+  min-height: px-to-rem($file-header-height);
+  border-radius: calc($gl-border-radius-base - 1px) calc($gl-border-radius-base - 1px) 0 0;
+}
+
+.rd-diff-file-stats {
+  margin-left: auto;
+}
+
+.rd-lines-added {
+  color: $green-600;
+}
+
+.rd-lines-removed {
+  color: $red-500;
+}
+
+.rd-diff-file-body {
+  border: 1px solid $gray-100;
+  border-top: 0;
+  border-radius: 0 0 calc($gl-border-radius-base - 1px) calc($gl-border-radius-base - 1px);
+}
diff --git a/app/assets/stylesheets/page_bundles/commit_rapid_diffs.scss b/app/assets/stylesheets/page_bundles/commit_rapid_diffs.scss
new file mode 100644
index 00000000000..65c50d0dc85
--- /dev/null
+++ b/app/assets/stylesheets/page_bundles/commit_rapid_diffs.scss
@@ -0,0 +1,2 @@
+@import 'mixins_and_variables_and_functions';
+@import 'components/rapid_diffs/diff_file_component';
diff --git a/app/assets/stylesheets/page_bundles/merge_request_rapid_diffs.scss b/app/assets/stylesheets/page_bundles/merge_request_rapid_diffs.scss
new file mode 100644
index 00000000000..65c50d0dc85
--- /dev/null
+++ b/app/assets/stylesheets/page_bundles/merge_request_rapid_diffs.scss
@@ -0,0 +1,2 @@
+@import 'mixins_and_variables_and_functions';
+@import 'components/rapid_diffs/diff_file_component';
diff --git a/app/components/rapid_diffs/diff_file_component.html.haml b/app/components/rapid_diffs/diff_file_component.html.haml
new file mode 100644
index 00000000000..70621552e2c
--- /dev/null
+++ b/app/components/rapid_diffs/diff_file_component.html.haml
@@ -0,0 +1,7 @@
+-# TODO: add fork suggestion (commits only)
+
+.rd-diff-file
+  = render RapidDiffs::DiffFileHeaderComponent.new(diff_file: @diff_file)
+  .rd-diff-file-body
+    -# TODO: replace with ViewComponents for each viewer
+    = render 'projects/diffs/viewer', viewer: viewer
diff --git a/app/components/rapid_diffs/diff_file_component.rb b/app/components/rapid_diffs/diff_file_component.rb
new file mode 100644
index 00000000000..ea7a7a19d7c
--- /dev/null
+++ b/app/components/rapid_diffs/diff_file_component.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RapidDiffs
+  class DiffFileComponent < ViewComponent::Base
+    def initialize(diff_file:)
+      @diff_file = diff_file
+    end
+
+    def viewer
+      @diff_file.has_renderable? ? @diff_file.rendered.viewer : @diff_file.viewer
+    end
+  end
+end
diff --git a/app/components/rapid_diffs/diff_file_header_component.html.haml b/app/components/rapid_diffs/diff_file_header_component.html.haml
new file mode 100644
index 00000000000..2148e1f7fbb
--- /dev/null
+++ b/app/components/rapid_diffs/diff_file_header_component.html.haml
@@ -0,0 +1,48 @@
+-# TODO: add file size
+-# TODO: add file toggle
+-# TODO: add comment button
+-# TODO: add viewed toggle
+-# TODO: add raw\rendered toggle
+-# TODO: add file actions:
+-#  * view file
+-#  * view replaced file (for image diffs)
+-#  * view on environment
+-#  * edit
+-#  * open in WebIDE
+-#  * toggle file comments
+-#  * submodule compare
+
+.rd-diff-file-header
+  .rd-diff-file-title
+    - if @diff_file.submodule?
+      %span
+        = helpers.sprite_icon('folder-git', file_icon: true)
+        %strong
+          = helpers.submodule_link(@diff_file.blob, @diff_file.content_sha, @diff_file.repository)
+      -# TODO: add copy button
+    - else
+      -# TODO: add icons for file types
+      - if @diff_file.renamed_file?
+        - old_path, new_path = helpers.mark_inline_diffs(@diff_file.old_path, @diff_file.new_path)
+        %strong
+          = old_path
+        →
+        %strong
+          = new_path
+      - else
+        %strong
+          = @diff_file.file_path
+        - if @diff_file.deleted_file?
+          = _("deleted")
+      -# TODO: add copy button
+      - if @diff_file.mode_changed?
+        %small #{@diff_file.a_mode} → #{@diff_file.b_mode}
+      - if @diff_file.stored_externally? && @diff_file.external_storage == :lfs
+        = helpers.gl_badge_tag(_('LFS'), variant: :neutral)
+  .rd-diff-file-stats
+    %span.rd-lines-added
+      %span +
+      %span{ "data-testid" => "js-file-addition-line" }= @diff_file.added_lines
+    %span.rd-lines-removed
+      %span −
+      %span{ "data-testid" => "js-file-deletion-line" }= @diff_file.removed_lines
diff --git a/app/components/rapid_diffs/diff_file_header_component.rb b/app/components/rapid_diffs/diff_file_header_component.rb
new file mode 100644
index 00000000000..b60f56f4f55
--- /dev/null
+++ b/app/components/rapid_diffs/diff_file_header_component.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RapidDiffs
+  class DiffFileHeaderComponent < ViewComponent::Base
+    def initialize(diff_file:)
+      @diff_file = diff_file
+    end
+  end
+end
diff --git a/app/helpers/invite_members_helper.rb b/app/helpers/invite_members_helper.rb
index 0443861903b..f381a54a208 100644
--- a/app/helpers/invite_members_helper.rb
+++ b/app/helpers/invite_members_helper.rb
@@ -10,14 +10,12 @@ module InviteMembersHelper
   end
 
   def invite_accepted_notice(member)
-    case member.source
-    when Project
-      _("You have been granted %{member_human_access} access to project %{name}.") %
-        { member_human_access: member.human_access, name: member.source.name }
-    when Group
-      _("You have been granted %{member_human_access} access to group %{name}.") %
-        { member_human_access: member.human_access, name: member.source.name }
-    end
+    format(
+      _('You have been granted access to the %{source_name} %{source_type} with the following role: %{role_name}.'),
+      source_name: member.source.name,
+      source_type: member.source.model_name.singular,
+      role_name: member.present.human_access
+    )
   end
 
   # Overridden in EE
diff --git a/app/presenters/member_presenter.rb b/app/presenters/member_presenter.rb
index 42b49a80b8a..d0c075c5b7e 100644
--- a/app/presenters/member_presenter.rb
+++ b/app/presenters/member_presenter.rb
@@ -19,6 +19,10 @@ class MemberPresenter < Gitlab::View::Presenter::Delegated
     []
   end
 
+  def role_type
+    'default'
+  end
+
   def can_resend_invite?
     invite? &&
       can?(current_user, admin_member_permission, source)
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 6133ae2ab2b..e5c9dcd604e 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -13,7 +13,7 @@
         .content
           = render "layouts/flash"
           - if custom_text.present?
-            .row.gl-mt-5.gl-row-gap-5
+            .row.gl-mt-5.gl-gap-y-5
               .col-md.order-12.sm-bg-gray
                 .col-sm-12
                   %h1.gl-mb-5.gl-font-size-h2
diff --git a/app/views/notify/member_access_granted_email.html.haml b/app/views/notify/member_access_granted_email.html.haml
index 49a571f154e..9835883e580 100644
--- a/app/views/notify/member_access_granted_email.html.haml
+++ b/app/views/notify/member_access_granted_email.html.haml
@@ -1,13 +1,13 @@
-- link_end = '</a>'.html_safe
 - source_type = member_source.model_name.singular
-- leave_link = polymorphic_url([member_source], leave: 1)
-- source_link = link_to(member_source.human_name, member_source.web_url, target: '_blank', rel: 'noopener noreferrer', class: :highlight)
-- access_level = content_tag(:span, member.human_access, class: :highlight)
+- source_name = link_to(member_source.human_name, member_source.web_url, target: '_blank', rel: 'noopener noreferrer', class: :highlight)
+- role_name = content_tag(:span, member.present.human_access, class: :highlight)
+- role_type = content_tag(:span, "#{member.present.role_type} role", class: :highlight)
 
 %tr
   %td.text-content
     %p
-      = _('You have been granted %{access_level} access to the %{source_link} %{source_type}.').html_safe % { access_level: access_level, source_link: source_link, source_type: source_type }
+      = safe_format(_('You have been granted access to the %{source_name} %{source_type} with the following role: %{role_name}.'), source_name: source_name, source_type: source_type, role_name: role_name)
+      = safe_format(_('This is a %{role_type}.'), role_type: role_type)
     %p
-      - leave_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: leave_link }
-      = _('If this was a mistake you can %{leave_link_start}leave the %{source_type}%{link_end}.').html_safe % { source_type: source_type, leave_link_start: leave_link_start, link_end: link_end }
+      - leave_link = link_to('', polymorphic_url([member_source], leave: 1), target: '_blank', rel: 'noopener noreferrer')
+      = safe_format(_('If this was a mistake you can %{leave_link_start}leave the %{source_type}%{link_end}.'), tag_pair(leave_link, :leave_link_start, :link_end), source_type: source_type)
diff --git a/app/views/notify/member_access_granted_email.text.erb b/app/views/notify/member_access_granted_email.text.erb
index 445009bb413..5bb879fea60 100644
--- a/app/views/notify/member_access_granted_email.text.erb
+++ b/app/views/notify/member_access_granted_email.text.erb
@@ -1,5 +1,8 @@
 <% source_type = member_source.model_name.singular %>
-<%= _('You have been granted %{access_level} access to the %{source_name} %{source_type}.') % { access_level: member.human_access, source_name: member_source.human_name, source_type: source_type  } %>
+<% role_name = member.present.human_access %>
+<% role_type = member.present.role_type %>
+<%= _('You have been granted access to the %{source_name} %{source_type} with the following role: %{role_name}.') % { source_name: member_source.human_name, source_type: source_type, role_name: role_name  } %>
+<%= _('This is a %{role_type} role.') % { role_type: role_type }  %>
 
 <%= member_source.web_url %>
 
diff --git a/app/views/notify/member_invited_email.html.haml b/app/views/notify/member_invited_email.html.haml
index 21d0f8b9108..06e1ee836b1 100644
--- a/app/views/notify/member_invited_email.html.haml
+++ b/app/views/notify/member_invited_email.html.haml
@@ -3,7 +3,8 @@
   project_or_group_name: member_source.human_name,
   project_or_group: member_source.model_name.singular,
   br_tag: '<br/>'.html_safe,
-  role: member.human_access.downcase }
+  role: member.present.human_access,
+  role_type: member.present.role_type }
 - join_text =  s_('InviteEmail|Join now')
 - inviter_name = member.created_by.name if member.created_by
 - join_url = invite_url(@token, invite_type: Emails::Members::INITIAL_INVITE)
@@ -21,9 +22,9 @@
     %img.mail-avatar{ height: "60", src: avatar_icon_for_user(member.created_by, 60, only_path: false), width: "60", alt: "" }
     %p
       - if member.created_by
-        = html_escape(s_("InviteEmail|%{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}")) % placeholders.merge({ inviter: (link_to inviter_name, user_url(member.created_by)).html_safe })
+        = html_escape(s_("InviteEmail|%{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} with the following role: %{role}.%{br_tag}This is a %{role_type} role.")) % placeholders.merge({ inviter: (link_to inviter_name, user_url(member.created_by)).html_safe })
       - else
-        = html_escape(s_("InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}")) % placeholders
+        = html_escape(s_("InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} with the following role: %{role}.%{br_tag}This is a %{role_type} role.")) % placeholders
     %p.invite-actions
       = link_to join_text, join_url, class: 'invite-btn-join'
 %tr.border-top
diff --git a/app/views/notify/member_invited_email.text.erb b/app/views/notify/member_invited_email.text.erb
index e58dfc10810..b82c4c3faff 100644
--- a/app/views/notify/member_invited_email.text.erb
+++ b/app/views/notify/member_invited_email.text.erb
@@ -1,9 +1,10 @@
-<% placeholders = { project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, role: member.human_access.downcase } %>
+<% placeholders = { project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, role: member.present.human_access} %>
 
 <% if member.created_by %>
-<%= s_('InviteEmail|%{inviter} invited you to join the %{project_or_group_name} %{project_or_group} as a %{role}') % placeholders.merge({ inviter: sanitize_name(member.created_by.name) }) %>
+<%= s_('InviteEmail|%{inviter} invited you to join the %{project_or_group_name} %{project_or_group} with the following role: %{role}.') % placeholders.merge({ inviter: sanitize_name(member.created_by.name) }) %>
 <% else %>
-<%= s_('InviteEmail|You have been invited to join the %{project_or_group_name} %{project_or_group} as a %{role}') % placeholders %>
+<%= s_('InviteEmail|You have been invited to join the %{project_or_group_name} %{project_or_group} with the following role: %{role}.') % placeholders %>
 <% end %>
+<%= _('This is a %{role_type} role.') % { role_type: member.present.role_type }  %>
 
 <%= s_('InviteEmail|Join now') %>: <%= invite_url(@token) %>
diff --git a/app/views/projects/_stat_anchor_list.html.haml b/app/views/projects/_stat_anchor_list.html.haml
index 977f8f5ff0b..862bc1fdfb1 100644
--- a/app/views/projects/_stat_anchor_list.html.haml
+++ b/app/views/projects/_stat_anchor_list.html.haml
@@ -4,7 +4,7 @@
 
 - return unless anchors.any?
 
-%ul.nav.gl-row-gap-2.gl-gap-x-5
+%ul.nav.gl-gap-y-2.gl-gap-x-5
   - anchors.each do |anchor|
     %li.nav-item
       - if anchor.link # render actionable link/button
diff --git a/app/views/projects/commit/rapid_diffs.html.haml b/app/views/projects/commit/rapid_diffs.html.haml
index b971af8b6d9..05947690949 100644
--- a/app/views/projects/commit/rapid_diffs.html.haml
+++ b/app/views/projects/commit/rapid_diffs.html.haml
@@ -6,7 +6,9 @@
 - page_title        "#{@commit.title} (#{@commit.short_id})", _('Commits')
 - page_description  @commit.description
 - add_page_specific_style 'page_bundles/pipelines'
+- add_page_specific_style 'page_bundles/commit_rapid_diffs'
 
 .container-fluid{ class: [container_class] }
   = render "commit_box"
   = render "ci_menu"
+  = render RapidDiffs::DiffFileComponent.with_collection(@diffs.diff_files)
diff --git a/app/views/projects/merge_requests/rapid_diffs.html.haml b/app/views/projects/merge_requests/rapid_diffs.html.haml
index 03306e98407..87b95f595bc 100644
--- a/app/views/projects/merge_requests/rapid_diffs.html.haml
+++ b/app/views/projects/merge_requests/rapid_diffs.html.haml
@@ -1,3 +1,5 @@
 - add_page_specific_style 'page_bundles/merge_request'
+- add_page_specific_style 'page_bundles/merge_request_rapid_diffs'
 
 = render 'page'
+= render RapidDiffs::DiffFileComponent.with_collection(@merge_request.diffs.diff_files)
diff --git a/app/views/shared/_md_preview.html.haml b/app/views/shared/_md_preview.html.haml
index 7ac6a822420..6f3655e69d3 100644
--- a/app/views/shared/_md_preview.html.haml
+++ b/app/views/shared/_md_preview.html.haml
@@ -11,7 +11,7 @@
 .md-area.position-relative
   .md-header.gl-px-3.gl-rounded-top-base.gl-border-b.gl-border-gray-100
     .gl-display-flex.gl-align-items-center.gl-flex-wrap.gl-justify-content-space-between
-      .md-header-toolbar.gl-display-flex.gl-py-3.gl-flex-wrap.gl-row-gap-3
+      .md-header-toolbar.gl-display-flex.gl-py-3.gl-flex-wrap.gl-gap-y-3
         = render Pajamas::ButtonComponent.new(category: :tertiary, size: :small, button_options: { class: 'js-md-preview-button', value: 'preview' }) do
           = _('Preview')
         = render 'shared/blob/markdown_buttons', supports_quick_actions: supports_quick_actions
diff --git a/config/application.rb b/config/application.rb
index 6e53c2baa65..46c12fd227c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -294,6 +294,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/clusters.css"
     config.assets.precompile << "page_bundles/commits.css"
     config.assets.precompile << "page_bundles/commit_description.css"
+    config.assets.precompile << "page_bundles/commit_rapid_diffs.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/dashboard.css"
     config.assets.precompile << "page_bundles/dashboard_projects.css"
@@ -323,6 +324,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/merge_conflicts.css"
     config.assets.precompile << "page_bundles/merge_request_analytics.css"
     config.assets.precompile << "page_bundles/merge_request.css"
+    config.assets.precompile << "page_bundles/merge_request_rapid_diffs.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
     config.assets.precompile << "page_bundles/milestone.css"
     config.assets.precompile << "page_bundles/ml_experiment_tracking.css"
diff --git a/doc/administration/audit_event_reports.md b/doc/administration/audit_event_reports.md
index 949ba333a36..e8a034d5ae1 100644
--- a/doc/administration/audit_event_reports.md
+++ b/doc/administration/audit_event_reports.md
@@ -4,74 +4,12 @@ group: Compliance
 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
 ---
 
-# Audit event reports
+# Audit events administration
 
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+In addition to [audit events](../user/compliance/audit_events.md), self-managed administrators can access additional
+features.
 
-A security audit is an in-depth analysis and review of your infrastructure, which is used to display
-areas of concern and potentially hazardous practices. To assist with the audit process, GitLab provides
-audit events which allow you to track a variety of different actions within GitLab.
-GitLab can help owners and administrators respond to auditors by generating
-comprehensive reports. These audit reports vary in scope, depending on the
-needs.
-
-For example, you can use audit events to track:
-
-- Who changed the permission level of a particular user for a GitLab project, and when.
-- Who added a new user or removed a user, and when.
-
-These events can be used to in an audit to assess risk, strengthen security measures, respond to incidents, and adhere to compliance. For a complete list the audit
-events GitLab provides, see [Audit event types](../administration/audit_event_types.md). For example:
-
-- Generate a report of audit events to provide to an external auditor requesting proof of certain logging capabilities.
-- Provide a report of all users showing their group and project memberships for a quarterly access review so the auditor can verify compliance with an organization's access management policy.
-
-Audit events are retained indefinitely. Because there is no retention timeframe, all audit events are available.
-
-## Prerequisites
-
-To view specific types of audit events, you need a minimum role.
-
-- To view the group audit events of all users in a group, you must have the [Owner role](../user/permissions.md#roles) for the group.
-- To view the project audit events of all users in a project, you must have at least the [Maintainer role](../user/permissions.md#roles) for the project.
-- To view the group and project audit events based on your own actions in a group or project, you must have at least the [Developer role](../user/permissions.md#roles)
-  for the group or project.
-
-Users with the [Auditor access level](auditor_users.md) can see group and project events for all users.
-
-## Viewing audit events
-
-Audit events can be viewed at the group, project, instance, and sign-in level. Each level has different audit events which it logs.
-
-### Group audit events
-
-DETAILS:
-**Tier:** Premium, Ultimate
-**Offering:** GitLab.com, Self-managed, GitLab Dedicated
-
-To view a group's audit events:
-
-1. On the left sidebar, select **Search or go to** and find your group.
-1. Select **Secure > Audit events**.
-1. Filter the audit events by the member of the project (user) who performed the action and date range.
-
-Group audit events can also be accessed using the [Group Audit Events API](../api/audit_events.md#group-audit-events). Group audit event queries `created_after` and `created_before` parameters are limited to a maximum 30 day difference between the dates.
-
-### Project audit events
-
-DETAILS:
-**Tier:** Premium, Ultimate
-**Offering:** GitLab.com, Self-managed, GitLab Dedicated
-
-1. On the left sidebar, select **Search or go to** and find your project.
-1. Select **Secure > Audit events**.
-1. Filter the audit events by the member of the project (user) who performed the action and date range.
-
-Project audit events can also be accessed using the [Project Audit Events API](../api/audit_events.md#project-audit-events). Project audit event queries `created_after` and `created_before` parameters are limited to a maximum 30 day difference between the dates.
-
-### Instance audit events
+## Instance audit events
 
 DETAILS:
 **Tier:** Premium, Ultimate
@@ -90,19 +28,6 @@ To view instance audit events:
 
 Instance audit events can also be accessed using the [Instance Audit Events API](../api/audit_events.md#instance-audit-events). Instance audit event queries are limited to a maximum of 30 days.
 
-### Sign-in audit events
-
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** GitLab.com, Self-managed, GitLab Dedicated
-
-Successful sign-in events are the only audit events available at all tiers. To see successful sign-in events:
-
-1. On the left sidebar, select your avatar.
-1. Select **Edit profile > Authentication log**.
-
-After upgrading to a paid tier, you can also see successful sign-in events on audit event pages.
-
 ## Exporting audit events
 
 DETAILS:
@@ -165,19 +90,9 @@ When a user is [impersonated](../administration/admin_area.md#user-impersonation
 
 ## Time zones
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/242014) in GitLab 15.7, GitLab UI shows dates and times in the user's local time zone instead of UTC.
-
-The time zone used for audit events depends on where you view them:
-
-- In GitLab UI, your local time zone (GitLab 15.7 and later) or UTC (GitLab 15.6 and earlier) is used.
-- The [Audit Events API](../api/audit_events.md) returns dates and times in UTC by default, or the
-  [configured time zone](timezone.md) on a self-managed GitLab instance.
-- In CSV exports, UTC is used.
+For information on timezones and audit events, see [Time zones](../user/compliance/audit_events.md#time-zones).
 
 ## Contribute to audit events
 
-If you don't see the event you want in any of the epics, you can either:
-
-- Use the **Audit Event Proposal** issue template to
-  [create an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Audit%20Event%20Proposal) to request it.
-- [Add it yourself](../development/audit_event_guide/index.md).
+For information on contributing to audit events, see
+[Contribute to audit events](../user/compliance/audit_events.md#contribute-to-audit-events).
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 9adc74fa617..672883993c7 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -257,6 +257,8 @@ Supported attributes:
 | `my_reaction_emoji`             | string         | No       | Returns merge requests reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. |
 | `not`                           | Hash           | No       | Returns merge requests that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `reviewer_id`, `reviewer_username`, `my_reaction_emoji`. |
 | `order_by`                      | string         | No       | Returns requests ordered by `created_at`, `title` or `updated_at` fields. Default is `created_at`. |
+| `page`                          | integer        | No       | The page of results to return. Defaults to 1. |
+| `per_page`                      | integer        | No       | The number of results per page. Defaults to 20. |
 | `reviewer_id`                   | integer        | No       | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given user `id`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_username`.  |
 | `reviewer_username`             | string         | No       | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given `username`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_id`. |
 | `scope`                         | string         | No       | Returns merge requests for the given scope: `created_by_me`, `assigned_to_me`, or `all`. |
@@ -272,15 +274,66 @@ Supported attributes:
 | `with_labels_details`           | boolean        | No       | If `true`, response returns more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. |
 | `with_merge_status_recheck`     | boolean        | No       | If `true`, this projection requests (but does not guarantee) the asynchronous recalculation of the `merge_status` field. Default is `false`. In GitLab 15.11 and later, enable the `restrict_merge_status_recheck` feature [flag](../administration/feature_flags.md) to ignore this attribute when requested by users without at least the Developer role. |
 
-In the response:
+If successful, returns [`200 OK`](rest/index.md#status-codes) and the following
+response attributes:
 
-- `project_id` represents the ID of the project where the merge request resides.
-  `project_id` always equals `target_project_id`.
-- Use the pagination parameters `page` and `per_page` to restrict the list of merge requests.
-- Project IDs vary depending on whether the merge request originates from the project, or a fork.
-  In merge requests originating from
-  - The same project: `target_project_id`, `project_id`, and `source_project_id` are the same.
-  - A fork: `target_project_id` and `project_id` are the same, but `source_project_id` is the fork project's ID.
+| Attribute                          | Type     | Description |
+| ---------------------------------- | -------- | ----------- |
+| `[].id`                            | integer  | ID of the merge request. |
+| `[].iid`                           | integer  | Internal ID of the merge request. |
+| `[].approvals_before_merge`        | integer  | Number of approvals required before this merge request can merge. To configure approval rules, see [Merge request approvals API](merge_request_approvals.md). [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/353097) in GitLab 16.0. Premium and Ultimate only. |
+| `[].assignee`                      | object   | First assignee of the merge request. |
+| `[].assignees`                     | array    | Assignees of the merge request. |
+| `[].author`                        | object   | User who created this merge request. |
+| `[].blocking_discussions_resolved` | boolean  | Indicates if all discussions are resolved only if all are required before merge request can be merged. |
+| `[].closed_at`                     | datetime | Timestamp of when the merge request was closed. |
+| `[].closed_by`                     | object   | User who closed this merge request. |
+| `[].created_at`                    | datetime | Timestamp of when the merge request was created. |
+| `[].description`                   | string   | Description of the merge request. |
+| `[].detailed_merge_status`         | string   | Detailed merge status of the merge request. See [merge status](#merge-status) for a list of potential values. |
+| `[].discussion_locked`             | boolean  | Indicates if comments on the merge request are locked to members only. |
+| `[].downvotes`                     | integer  | Number of downvotes for the merge request. |
+| `[].draft`                         | boolean  | Indicates if the merge request is a draft. |
+| `[].force_remove_source_branch`    | boolean  | Indicates if the project settings lead to source branch deletion after merge. |
+| `[].has_conflicts`                 | boolean  | Indicates if merge request has conflicts and cannot merge. Dependent on the `merge_status` property. Returns `false` unless `merge_status` is `cannot_be_merged`. |
+| `[].labels`                        | array    | Labels of the merge request. |
+| `[].merge_commit_sha`              | string   | SHA of the merge request commit. Returns `null` until merged. |
+| `[].merge_status`                  | string   | Status of the merge request. Can be `unchecked`, `checking`, `can_be_merged`, `cannot_be_merged`, or `cannot_be_merged_recheck`. Affects the `has_conflicts` property. For important notes on response data, see [Single merge request response notes](#single-merge-request-response-notes). [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/3169#note_1162532204) in GitLab 15.6. Use `detailed_merge_status` instead. |
+| `[].merge_user`                    | object   | User who merged this merge request, the user who set it to auto-merge, or `null`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349031) in GitLab 14.7. |
+| `[].merge_when_pipeline_succeeds`  | boolean  | Indicates if the merge has been set to merge when its pipeline succeeds. |
+| `[].merged_at`                     | datetime | Timestamp of when the merge request was merged. |
+| `[].merged_by`                     | object   | User who merged this merge request or set it to auto-merge. [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/350534) in GitLab 14.7, and scheduled for removal in [API version 5](https://gitlab.com/groups/gitlab-org/-/epics/8115). Use `merge_user` instead. |
+| `[].milestone`                     | object   | Milestone of the merge request. |
+| `[].prepared_at`                   | datetime | Timestamp of when the merge request was prepared. This field is populated one time, only after all the [preparation steps](#preparation-steps) are completed, and is not updated if more changes are added. |
+| `[].project_id`                    | integer  | ID of the project where the merge request resides. Always equal to `target_project_id`. |
+| `[].reference`                     | string   | Internal reference of the merge request. Returned in shortened format by default. [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20354) in GitLab 12.7, and scheduled for removal in [API version 5](https://gitlab.com/groups/gitlab-org/-/epics/8115). Use `references` instead. |
+| `[].references`                    | object   | Internal references of the merge request. Includes `short`, `relative`, and `full` references. `references.relative` is relative to the merge request's group or project. When fetched from the merge request's project, `relative` and `short` formats are identical. When requested across groups or projects, `relative` and `full` formats are identical.|
+| `[].reviewers`                     | array    | Reviewers of the merge request. |
+| `[].sha`                           | string   | Diff head SHA of the merge request. |
+| `[].should_remove_source_branch`   | boolean  | Indicates if the source branch of the merge request should be deleted after merge. |
+| `[].source_branch`                 | string   | Source branch of the merge request. |
+| `[].source_project_id`             | integer  | ID of the merge request source project. Equal to `target_project_id`, unless the merge request originates from a fork. |
+| `[].squash`                        | boolean  | If `true`, squash all commits into a single commit on merge. [Project settings](../user/project/merge_requests/squash_and_merge.md#configure-squash-options-for-a-project) might override this value. Use `squash_on_merge` instead to take project squash options into account. |
+| `[].squash_commit_sha`             | string   | SHA of the squash commit. Empty until merged. |
+| `[].squash_on_merge`               | boolean  | Indicates if the merge request will be squashed when merged. |
+| `[].state`                         | string   | State of the merge request. Can be `opened`, `closed`, `merged`, `locked`. |
+| `[].target_branch`                 | string   | Target branch of the merge request. |
+| `[].target_project_id`             | integer  | ID of the merge request target project. |
+| `[].task_completion_status`        | object   | Completion status of tasks. Includes `count` and `completed_count`. |
+| `[].time_stats`                    | object   | Time tracking stats of the merge request. Includes `time_estimate`, `total_time_spent`, `human_time_estimate`, and `human_total_time_spent`. |
+| `[].title`                         | string   | Title of the merge request. |
+| `[].updated_at`                    | datetime | Timestamp of when the merge request was updated. |
+| `[].upvotes`                       | integer  | Number of upvotes for the merge request. |
+| `[].user_notes_count`              | integer  | User notes count of the merge request. |
+| `[].web_url`                       | string   | Web URL of the merge request. |
+| `[].work_in_progress`              | boolean  | Deprecated: Use `draft` instead. Indicates if the merge request is a draft. |
+
+Example request:
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/projects/1/merge_requests"
+```
 
 Example response:
 
@@ -300,6 +353,7 @@ Example response:
       "name": "Douwe Maan",
       "username": "DouweM",
       "state": "active",
+      "locked": false,
       "avatar_url": "https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png",
       "web_url": "https://gitlab.com/DouweM"
     },
@@ -308,6 +362,7 @@ Example response:
       "name": "Douwe Maan",
       "username": "DouweM",
       "state": "active",
+      "locked": false,
       "avatar_url": "https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png",
       "web_url": "https://gitlab.com/DouweM"
     },
@@ -326,6 +381,7 @@ Example response:
       "name": "Administrator",
       "username": "admin",
       "state": "active",
+      "locked": false,
       "avatar_url": null,
       "web_url" : "https://gitlab.example.com/admin"
     },
@@ -334,6 +390,7 @@ Example response:
       "name": "Administrator",
       "username": "admin",
       "state": "active",
+      "locked": false,
       "avatar_url": null,
       "web_url" : "https://gitlab.example.com/admin"
     },
@@ -342,6 +399,7 @@ Example response:
       "username": "axel.block",
       "id": 12,
       "state": "active",
+      "locked": false,
       "avatar_url": "http://www.gravatar.com/avatar/46f6f7dc858ada7be1853f7fb96e81da?s=80&d=identicon",
       "web_url": "https://gitlab.example.com/axel.block"
     }],
@@ -384,9 +442,8 @@ Example response:
     "discussion_locked": null,
     "should_remove_source_branch": true,
     "force_remove_source_branch": false,
-    "allow_collaboration": false,
-    "allow_maintainer_to_push": false,
     "web_url": "http://gitlab.example.com/my-group/my-project/merge_requests/1",
+    "reference": "!1",
     "references": {
       "short": "!1",
       "relative": "!1",
@@ -399,12 +456,14 @@ Example response:
       "human_total_time_spent": null
     },
     "squash": false,
+    "squash_on_merge": false,
     "task_completion_status":{
       "count":0,
       "completed_count":0
     },
     "has_conflicts": false,
-    "blocking_discussions_resolved": true
+    "blocking_discussions_resolved": true,
+    "approvals_before_merge": 2
   }
 ]
 ```
diff --git a/doc/architecture/blueprints/ci_data_decay/index.md b/doc/architecture/blueprints/ci_data_decay/index.md
index 4dd40913ca0..0b37a9a6fd0 100644
--- a/doc/architecture/blueprints/ci_data_decay/index.md
+++ b/doc/architecture/blueprints/ci_data_decay/index.md
@@ -14,23 +14,27 @@ participating-stages: []
 
 ## Summary
 
-GitLab CI/CD is one of the most data and compute intensive components of GitLab.
-Since its initial release in 2012,
-the CI/CD subsystem has evolved significantly. It was [integrated into GitLab in September 2015](https://about.gitlab.com/releases/2015/09/22/gitlab-8-0-released/)
-and has become [one of the most beloved CI/CD solutions](https://about.gitlab.com/blog/2017/09/27/gitlab-leader-continuous-integration-forrester-wave/).
+GitLab CI/CD, [integrated into GitLab in 2015](https://about.gitlab.com/releases/2015/09/22/gitlab-8-0-released/),
+is a [crucial]((https://about.gitlab.com/blog/2017/09/27/gitlab-leader-continuous-integration-forrester-wave/))
+yet resource-intensive component that has experienced exponential growth, surpassing 1 billion builds by 2021.
 
-On February 1st, 2021, GitLab.com surpassed 1 billion CI/CD builds, and the number of
-builds [continues to grow exponentially](../ci_scale/index.md).
+Despite its evolution, the CI/CD data storage architecture remains largely unchanged since 2012,
+posing scalability challenges due to the vast volume of data stored in PostgreSQL.
 
-GitLab CI/CD has come a long way since the initial release, but the design of
-the data storage for pipeline builds remains almost the same since 2012. In
-2021 we started working on database decomposition and extracting CI/CD data to
-a separate database. Now we want to improve the architecture of GitLab CI/CD
-product to enable further scaling.
+The proposed strategies involves:
+
+1. Partitioning CI/CD data tables.
+1. Reducing the growth rate of metadata.
+1. Moving less accessed data to other storage solutions like object storage.
+1. Introducing configurable data retention policies.
+
+This architectural overhaul aims to enhance reliability, scalability, and performance while maintaining
+data accessibility and compliance.
 
 ## Goals
 
-**Implement a new architecture of CI/CD data storage to enable scaling.**
+This architectural overhaul aims to enhance reliability, scalability, and performance while maintaining
+data accessibility and compliance.
 
 ## Challenges
 
diff --git a/doc/development/avoiding_required_stops.md b/doc/development/avoiding_required_stops.md
index b9abc171531..6db014929bb 100644
--- a/doc/development/avoiding_required_stops.md
+++ b/doc/development/avoiding_required_stops.md
@@ -31,14 +31,6 @@ across greater than 1-3 minor releases.
 Wherever possible, a required stop should be avoided. If it can't be avoided,
 the required stop should be aligned to a _scheduled_ required stop.
 
-In cases where we are considering retroactively declaring an unplanned required stop,
-contact the [Distribution team product manager](https://handbook.gitlab.com/handbook/product/categories/#distributionbuild-group) to advise on next steps. If there
-is uncertainty about whether we should declare a required stop, the Distribution product
-manager may escalate to GitLab product leadership (VP or Chief Product Officer) to make
-a final determination. This may happen, for example, if a change might require a stop for
-a small subset of very large self-managed installations and there are well-defined workarounds
-if customers run into issues.
-
 Scheduled required stops are often implemented for the previous `major`.`minor`
 release just prior to a `major` version release in order to accommodate multiple
 [planned deprecations](../update/terminology.md#deprecation) and known
@@ -56,6 +48,16 @@ upgrade stop. The first planned required upgrade stop is scheduled for GitLab
 treated as a regular upgrade.
 >>>
 
+## Retroactively adding required stops
+
+In cases where we are considering retroactively declaring an unplanned required stop,
+contact the [Distribution team product manager](https://handbook.gitlab.com/handbook/product/categories/#distributionbuild-group) to advise on next steps. If there
+is uncertainty about whether we should declare a required stop, the Distribution product
+manager may escalate to GitLab product leadership (VP or Chief Product Officer) to make
+a final determination. This may happen, for example, if a change might require a stop for
+a small subset of very large self-managed installations and there are well-defined workarounds
+if customers run into issues.
+
 ## Causes of required stops
 
 ### Inaccurate assumptions about completed migrations
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index 14aba7ede0e..85d31cecf7b 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -761,7 +761,11 @@ For basic guidance on choosing a cluster configuration you may refer to [Elastic
 
 #### Number of Elasticsearch shards
 
-Set the number of Elasticsearch shards per index to at least `5`.
+For single-node clusters, set the number of Elasticsearch shards per index to the number of
+CPU cores. Keep the average shard size between a few GB and 30 GB.
+
+For multi-node clusters, set the number of Elasticsearch shards per index to at least `5`.
+
 To update the shard size for an index, change the setting and trigger [zero-downtime reindexing](#zero-downtime-reindexing).
 
 ##### Indices with database data
@@ -797,7 +801,9 @@ For example, a node with a 30 GB heap must have a maximum of 600 shards.
 
 #### Number of Elasticsearch replicas
 
-Set the number of Elasticsearch replicas per index to `1` (each shard has one replica).
+For single-node clusters, set the number of Elasticsearch replicas per index to `0`.
+
+For multi-node clusters, set the number of Elasticsearch replicas per index to `1` (each shard has one replica).
 The number must not be `0` because losing one node corrupts the index.
 
 ### How to index large instances efficiently
diff --git a/doc/tutorials/scrum_events/index.md b/doc/tutorials/scrum_events/index.md
index deb6d5f8f64..ab4fcb28421 100644
--- a/doc/tutorials/scrum_events/index.md
+++ b/doc/tutorials/scrum_events/index.md
@@ -45,19 +45,39 @@ Settings and configurations applied at the group level cascade down to child pro
 standardize labels, boards, and iterations across multiple projects:
 
 ```mermaid
+%%{init: { "fontFamily": "GitLab Sans" }}%%
 flowchart TD
+    accTitle: GitLab inheritance model diagram
+    accDescr: Shows how groups, projects, issues, labels, milestones, iterations, tasks, and epics relate to one another in GitLab
     Group -->|Contains| Project
     Group -->|Contains| Epics
     Group -->|Contains| Labels
     Group -->|Contains| Boards
     Group -->|Contains| Iterations
+    Group -->|Contains| Milestones
+    Group -->|Contains| Roadmaps
     Project -->|Contains| Issues
+    Project -->|Contains| Templates
+    Project -->|Contains| Tasks
+    Project -->|Contains| Milestones
+    Project -->|Contains| Labels
     Labels .->|Cascades To| Project
-    Issues .->|Rolls Up To| Group
-    Iterations .->|Cascades To| Project
-    Issues .->|Assigned To| Epics
-    Issues .->|Visible In| Boards
-    Issues .->|Assigned To| Iterations
+    Issues .->|Rolls up to| Group
+    Iterations .->|Cascades to| Project
+    Milestones .->|Cascades to| Project
+    Templates .->|Cascades to| Project
+    Templates .->|Configured in| Group
+    Issues .->|Child of| Epics
+    Issues .->|Visible in| Boards
+    Issues .->|Visible in| Lists
+    Issues .->|Assigned to| Iterations
+    Issues .->|Assigned to| Milestones
+    Tasks  .->|Child of| Issues
+    Tasks .->|Assigned to| Iterations
+    Tasks .->|Assigned to| Milestones
+    Epics .->|Visible in| Boards
+    Epics .->|Visible in| Roadmaps
+    Epics .->|Visible in| Lists
 ```
 
 - Groups contain one or more projects, epics, boards, labels, and iterations.
diff --git a/doc/user/analytics/analytics_dashboards.md b/doc/user/analytics/analytics_dashboards.md
index b5d4a1250b2..acb7a24a694 100644
--- a/doc/user/analytics/analytics_dashboards.md
+++ b/doc/user/analytics/analytics_dashboards.md
@@ -9,51 +9,49 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 DETAILS:
 **Tier:** Ultimate
 **Offering:** Self-managed
-**Status:** Experiment
 
 > - Introduced in GitLab 15.9 as an [Experiment](../../policy/experiment-beta-support.md#experiment) feature [with a flag](../../administration/feature_flags.md) named `combined_analytics_dashboards`. Disabled by default.
 > - `combined_analytics_dashboards` [enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/389067) by default in GitLab 16.11.
 
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+
 Analytics dashboards help you visualize the collected data.
-You can use built-in dashboards or create your own with custom visualizations.
+You can use built-in dashboards by GitLab or create your own dashboards with custom visualizations.
 
 ## Data sources
 
 A data source is a connection to a database or collection of data which can be used by your dashboard
 filters and visualizations to query and retrieve results.
 
-The following data sources are configured for analytics dashboards:
+Analytics dashboards use the following data sources:
 
 - [Product analytics](../product_analytics/index.md)
 - [Value Stream Management](../analytics/value_streams_dashboard.md)
 
-To contribute, see [adding a new visualization data source](../../development/fe_guide/customizable_dashboards.md#adding-a-new-visualization-data-source).
+You can also add [custom visualization data sources](../../development/fe_guide/customizable_dashboards.md#adding-a-new-visualization-data-source).
 
 ## Built-in dashboards
 
 To help you get started with analytics, GitLab provides built-in dashboards with predefined visualizations.
-These dashboards are labeled **By GitLab**, and you cannot edit them.
-Instead, you can create a custom dashboard with a similar style.
+These dashboards are labeled **By GitLab**.
+You cannot edit the built-in dashboards, but you can create custom dashboards with a similar style.
 
-### Product analytics
+### Product analytics dashboards
 
-When [product analytics](../product_analytics/index.md) is enabled and onboarded, two built-in dashboard are added:
+When [product analytics](../product_analytics/index.md) is enabled and onboarded, two built-in dashboards are available:
 
 - **Audience** displays metrics related to traffic, such as the number of users and sessions.
 - **Behavior** displays metrics related to user activity, such as the number of page views and events.
 
-For more information about the development of product analytics, see the [group direction page](https://about.gitlab.com/direction/monitor/product-analytics/). To leave feedback about bugs or functionality:
-
-- Comment on issue [391970](https://gitlab.com/gitlab-org/gitlab/-/issues/391970).
-- Create an issue with the `group::product analytics` label.
-
-### Value Stream Management
+### Value Stream Management dashboard
 
 - **Value Streams Dashboard** displays metrics related to [DevOps performance, security exposure, and workstream optimization](../analytics/value_streams_dashboard.md#devsecops-metrics-comparison-panel).
 
 ## Custom dashboards
 
-With custom dashboards, you can design and create visualizations for the metrics that are most relevant to your use case.
+Use custom dashboards to design and create visualizations for the metrics that are most relevant to your use case.
 You can create custom dashboards with the dashboard designer.
 
 - Each project can have an unlimited number of dashboards.
@@ -85,7 +83,7 @@ You can use the dashboard designer to:
 NOTE:
 This feature is only compatible with the [product analytics](../product_analytics/index.md) data source.
 
-You can use the dashboard designer to:
+You can use the visualization designer to:
 
 - [Create custom visualizations](#create-a-custom-visualization).
 - [Generate custom visualizations with GitLab Duo](#generate-a-custom-visualization-with-gitlab-duo).
@@ -123,7 +121,6 @@ To view the Value Streams Dashboard as an analytics dashboard for a project:
 DETAILS:
 **Tier:** Ultimate
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
-**Status:** Experiment
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/390542) in GitLab 16.2 [with a flag](../../administration/feature_flags.md) named `group_analytics_dashboards`. Disabled by default.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/416970) in GitLab 16.8.
@@ -139,7 +136,7 @@ To view a list of dashboards (both built-in and custom) for a group:
 1. Select **Analyze > Analytics dashboards**.
 1. From the list of available dashboards, select the dashboard you want to view.
 
-### View the value streams dashboard
+### View the Value Streams Dashboard
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132839) in GitLab 16.6 [with a flag](../../administration/feature_flags.md) named `group_analytics_dashboard_dynamic_vsd`. Disabled by default.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/432185) in GitLab 17.0.
@@ -162,7 +159,7 @@ Prerequisites:
 ### Group dashboards
 
 NOTE:
-This feature will be connected to group-level dashboards as part of [issue #411572](https://gitlab.com/gitlab-org/gitlab/-/issues/411572).
+[Issue 411572](https://gitlab.com/gitlab-org/gitlab/-/issues/411572) proposes connecting this feature to group-level dashboards.
 
 To change the location of a group's dashboards:
 
@@ -203,10 +200,10 @@ To define a dashboard:
 1. In the new directory, create a `.yaml` file with the same name as the directory, for example `.gitlab/analytics/dashboards/my_dashboard/my_dashboard.yaml`.
 
    This file contains the dashboard definition. It must conform to the JSON schema defined in `ee/app/validators/json_schemas/analytics_dashboard.json`.
-1. Optional. To create new visualizations to add to your dashboard see [defining a chart visualization](#define-a-chart-visualization).
+1. Optional. To create new visualizations to add to your dashboard, see [defining a chart visualization](#define-a-chart-visualization).
 
 For [example](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/gitlab/analytics/product_analytics/dashboards/audience.yaml), if you want to create three dashboards (Conversion funnels, Demographic breakdown, and North star metrics)
-and one visualization (line chart) that applies to all dashboards, the file structure would be:
+and one visualization (line chart) that applies to all dashboards, the file structure looks like this:
 
 ```plaintext
 .gitlab/analytics/dashboards
@@ -222,14 +219,14 @@ and one visualization (line chart) that applies to all dashboards, the file stru
 
 ## Define a chart visualization
 
-You can define different charts, and add visualization options to some of them:
+You can define different charts and add visualization options to some of them, such as:
 
 - Line chart, with the options listed in the [ECharts documentation](https://echarts.apache.org/en/option.html).
 - Column chart, with the options listed in the [ECharts documentation](https://echarts.apache.org/en/option.html).
 - Data table.
 - Single stat, with the only option to set `decimalPlaces` (number, default value is 0).
 
-To define a chart for your dashboards:
+To define a chart visualization for your dashboards:
 
 1. In the `.gitlab/analytics/dashboards/visualizations/` directory, create a `.yaml` file.
    The filename should be descriptive of the visualization it defines.
@@ -319,27 +316,30 @@ To generate a custom visualization with GitLab Duo using a natural language quer
 1. Select **Generate with GitLab Duo**.
 1. Select **Save**.
 
-After you saved a visualization, you can add it to a new or existing custom dashboard in the same project.
+After you save a visualization, you can add it to a new or existing custom dashboard in the same project.
 
 ## Troubleshooting
 
 ### `Something went wrong while loading the dashboard.`
 
-If the dashboard displays a global error message that data could not be loaded, first try reloading the page. If the error persists:
+If the dashboard displays a global error message that data could not be loaded, first try reloading the page.
+If the error persists:
 
 - Check that your configurations match the [dashboard JSON schema](#define-a-dashboard) defined in `ee/app/validators/json_schemas/analytics_dashboard.json`.
-- For product analytics, check your [admin and project settings](../product_analytics/index.md#project-level-settings), and make sure they are set up correctly.
+- For product analytics, make sure your [admin and project settings](../product_analytics/index.md#project-level-settings) are set up correctly.
 
 ### `Invalid visualization configuration`
 
-If a dashboard panel displays a message that the visualization configuration is invalid, check that your visualization configurations match the [visualization JSON schema](#define-a-chart-visualization) defined in `ee/app/validators/json_schemas/analytics_visualization.json`.
+If a dashboard panel displays a message that the visualization configuration is invalid,
+check that your visualization configurations match the [visualization JSON schema](#define-a-chart-visualization)
+defined in `ee/app/validators/json_schemas/analytics_visualization.json`.
 
 ### Dashboard panel error
 
 If a dashboard panel displays an error message:
 
-- Check your [Cube query](../product_analytics/index.md#product-analytics-dashboards) and [visualization](../analytics/analytics_dashboards.md#define-a-chart-visualization)
-  configurations, and make sure they are set up correctly.
+- Make sure your [Cube query](../product_analytics/index.md#product-analytics-dashboards) and
+[visualization](../analytics/analytics_dashboards.md#define-a-chart-visualization) configurations are set up correctly.
 - For [product analytics](../product_analytics/index.md), also check that your visualization's Cube query is valid.
 
 ### Generate visualization with GitLab Duo returns unexpected results
diff --git a/doc/user/compliance/audit_events.md b/doc/user/compliance/audit_events.md
new file mode 100644
index 00000000000..36b8088709f
--- /dev/null
+++ b/doc/user/compliance/audit_events.md
@@ -0,0 +1,108 @@
+---
+stage: Govern
+group: Compliance
+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
+---
+
+# Audit events
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+A security audit is an in-depth analysis and review of your infrastructure, which is used to display
+areas of concern and potentially hazardous practices. To assist with the audit process, GitLab provides
+audit events which allow you to track a variety of different actions within GitLab.
+GitLab can help owners and administrators respond to auditors by generating
+comprehensive reports. These audit reports vary in scope, depending on the
+needs.
+
+For example, you can use audit events to track:
+
+- Who changed the permission level of a particular user for a GitLab project, and when.
+- Who added a new user or removed a user, and when.
+
+These events can be used to in an audit to assess risk, strengthen security measures, respond to incidents, and adhere to compliance. For a complete list the audit
+events GitLab provides, see [Audit event types](../../administration/audit_event_types.md). For example:
+
+- Generate a report of audit events to provide to an external auditor requesting proof of certain logging capabilities.
+- Provide a report of all users showing their group and project memberships for a quarterly access review so the auditor can verify compliance with an organization's access management policy.
+
+Audit events are retained indefinitely. Because there is no retention timeframe, all audit events are available.
+
+## Prerequisites
+
+To view specific types of audit events, you need a minimum role.
+
+- To view the group audit events of all users in a group, you must have the [Owner role](../permissions.md#roles) for the group.
+- To view the project audit events of all users in a project, you must have at least the [Maintainer role](../permissions.md#roles) for the project.
+- To view the group and project audit events based on your own actions in a group or project, you must have at least the [Developer role](../permissions.md#roles)
+  for the group or project.
+
+Users with the [Auditor access level](../../administration/auditor_users.md) can see group and project events for all users.
+
+## Viewing audit events
+
+Audit events can be viewed at the group, project, instance, and sign-in level. Each level has different audit events which it logs.
+
+### Group audit events
+
+DETAILS:
+**Tier:** Premium, Ultimate
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+To view a group's audit events:
+
+1. On the left sidebar, select **Search or go to** and find your group.
+1. Select **Secure > Audit events**.
+1. Filter the audit events by the member of the project (user) who performed the action and date range.
+
+Group audit events can also be accessed using the [Group Audit Events API](../../api/audit_events.md#group-audit-events). Group audit event queries `created_after` and `created_before` parameters are limited to a maximum 30 day difference between the dates.
+
+### Project audit events
+
+DETAILS:
+**Tier:** Premium, Ultimate
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Secure > Audit events**.
+1. Filter the audit events by the member of the project (user) who performed the action and date range.
+
+Project audit events can also be accessed using the [Project Audit Events API](../../api/audit_events.md#project-audit-events). Project audit event queries `created_after` and `created_before` parameters are limited to a maximum 30 day difference between the dates.
+
+### Sign-in audit events
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+Successful sign-in events are the only audit events available at all tiers. To see successful sign-in events:
+
+1. On the left sidebar, select your avatar.
+1. Select **Edit profile > Authentication log**.
+
+After upgrading to a paid tier, you can also see successful sign-in events on audit event pages.
+
+## Time zones
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/242014) in GitLab 15.7, GitLab UI shows dates and times in the user's local time zone instead of UTC.
+
+The time zone used for audit events depends on where you view them:
+
+- In GitLab UI, your local time zone (GitLab 15.7 and later) or UTC (GitLab 15.6 and earlier) is used.
+- The [Audit Events API](../../api/audit_events.md) returns dates and times in UTC by default, or the
+  [configured time zone](../../administration/timezone.md) on a self-managed GitLab instance.
+- In CSV exports, UTC is used.
+
+## Contribute to audit events
+
+If you don't see the event you want in any of the epics, you can either:
+
+- Use the **Audit Event Proposal** issue template to
+  [create an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Audit%20Event%20Proposal) to request it.
+- [Add it yourself](../../development/audit_event_guide/index.md).
+
+## Administer topics
+
+Instance administrators can [administer audit events](../../administration/audit_event_reports.md) from the Admin Area.
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 182540b7a21..3030ee28cc6 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -152,10 +152,9 @@ When transferring groups, note:
 - You must update your local repositories to point to the new location.
 - If the immediate parent group's visibility is lower than the group's current visibility, visibility levels for subgroups and projects change to match the new parent group's visibility.
 - Only explicit group membership is transferred, not inherited membership. If the group's owners have only inherited membership, this leaves the group without an owner. In this case, the user transferring the group becomes the group's owner.
-- Transfers fail if [npm packages](../packages/npm_registry/index.md) exist in any of the projects in the group, or in any of its subgroups.
+- Transfers fail if the group is a top-level group and [npm packages](../packages/npm_registry/index.md) following the [naming convention](../packages/npm_registry/index.md#naming-convention) exist in any of the projects in the group, or in any of its subgroups.
 - Existing packages that use a group-level endpoint (Maven, NuGet, PyPI, Composer, and Debian) need to be updated per the package's steps for setting up the group level endpoint.
 - Existing package names need to be updated if the package uses an instance level endpoint ([Maven](../packages/maven_repository/index.md#naming-convention), [npm](../packages/npm_registry/index.md#naming-convention), [Conan](../packages/conan_repository/index.md#package-recipe-naming-convention-for-instance-remotes)) and the group was moved to another root level namespace.
-- [Maven packages](../packages/maven_repository/index.md#naming-convention) follow a naming convention that prevent installing or publishing the respective package from a group level endpoint after group transfer.
 - Top-level groups that have a subscription on GitLab.com cannot be transferred. To make the transfer possible, the top-level group's subscription must be removed first. Then the top-level group can be transferred as a subgroup to another top-level group.
 
 To transfer a group:
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index 84a8938dd13..d470be09ba9 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -109,7 +109,7 @@ You can create a merge request when you create a branch.
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Code > Branches**.
 1. Type a branch name and select **New branch**.
-1. Above the file list, on the right side, select **Create merge request**.
+1. Above the file list, select **Create merge request**.
    A merge request is created. The default branch is the target.
 1. Fill out the fields and select **Create merge request**.
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3881b5a4dea..037885bc431 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -27985,10 +27985,10 @@ msgstr ""
 msgid "Invite members"
 msgstr ""
 
-msgid "InviteEmail|%{inviter} invited you to join the %{project_or_group_name} %{project_or_group} as a %{role}"
+msgid "InviteEmail|%{inviter} invited you to join the %{project_or_group_name} %{project_or_group} with the following role: %{role}."
 msgstr ""
 
-msgid "InviteEmail|%{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}"
+msgid "InviteEmail|%{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} with the following role: %{role}.%{br_tag}This is a %{role_type} role."
 msgstr ""
 
 msgid "InviteEmail|%{project_or_group} details"
@@ -28012,10 +28012,10 @@ msgstr ""
 msgid "InviteEmail|What's it about?"
 msgstr ""
 
-msgid "InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}"
+msgid "InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} with the following role: %{role}.%{br_tag}This is a %{role_type} role."
 msgstr ""
 
-msgid "InviteEmail|You have been invited to join the %{project_or_group_name} %{project_or_group} as a %{role}"
+msgid "InviteEmail|You have been invited to join the %{project_or_group_name} %{project_or_group} with the following role: %{role}."
 msgstr ""
 
 msgid "InviteMembersBanner|Collaborate with your team"
@@ -53141,6 +53141,12 @@ msgstr ""
 msgid "This is a \"Ghost User\", created to hold all issues authored by users that have since been deleted. This user cannot be removed."
 msgstr ""
 
+msgid "This is a %{role_type} role."
+msgstr ""
+
+msgid "This is a %{role_type}."
+msgstr ""
+
 msgid "This is a Jira user."
 msgstr ""
 
@@ -59819,16 +59825,7 @@ msgstr ""
 msgid "You have been added to ticket #%{issue_iid}."
 msgstr ""
 
-msgid "You have been granted %{access_level} access to the %{source_link} %{source_type}."
-msgstr ""
-
-msgid "You have been granted %{access_level} access to the %{source_name} %{source_type}."
-msgstr ""
-
-msgid "You have been granted %{member_human_access} access to group %{name}."
-msgstr ""
-
-msgid "You have been granted %{member_human_access} access to project %{name}."
+msgid "You have been granted access to the %{source_name} %{source_type} with the following role: %{role_name}."
 msgstr ""
 
 msgid "You have been invited by %{link_to_inviter} to join %{source_name} %{strong_open}%{link_to_source}%{strong_close} as %{role}"
diff --git a/spec/features/invites_spec.rb b/spec/features/invites_spec.rb
index 1ea3ad019d9..b63705affbf 100644
--- a/spec/features/invites_spec.rb
+++ b/spec/features/invites_spec.rb
@@ -87,7 +87,8 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures, feature_cate
             end
 
             it 'accepts invite' do
-              expect(page).to have_content('You have been granted Developer access to group Owned.')
+              expect(page)
+                .to have_content('You have been granted access to the Owned group with the following role: Developer.')
             end
           end
         end
@@ -167,7 +168,8 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures, feature_cate
             fill_in_sign_up_form(new_user, invite: true)
 
             expect(page).to have_current_path(group_path(group), ignore_query: true)
-            expect(page).to have_content('You have been granted Owner access to group Owned.')
+            expect(page)
+              .to have_content('You have been granted access to the Owned group with the following role: Owner.')
           end
         end
       end
@@ -230,7 +232,8 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures, feature_cate
         fill_in_sign_up_form(new_user, 'Register', invite: true)
 
         expect(page).to have_current_path(group_path(group))
-        expect(page).to have_content('You have been granted Owner access to group Owned.')
+        expect(page)
+          .to have_content('You have been granted access to the Owned group with the following role: Owner.')
       end
     end
 
diff --git a/spec/features/registrations/oauth_registration_spec.rb b/spec/features/registrations/oauth_registration_spec.rb
index 5265a05c66f..ca335059bf7 100644
--- a/spec/features/registrations/oauth_registration_spec.rb
+++ b/spec/features/registrations/oauth_registration_spec.rb
@@ -106,7 +106,8 @@ RSpec.describe 'OAuth Registration', :js, :allow_forgery_protection, feature_cat
           visit invite_path(group_invite.raw_invite_token, extra_params)
           click_link_or_button Gitlab::Auth::OAuth::Provider.label_for(provider)
 
-          expect(page).to have_content('You have been granted Owner access to group Owned.')
+          expect(page)
+            .to have_content('You have been granted access to the Owned group with the following role: Owner.')
           expect(page).to have_current_path(group_path(group), ignore_query: true)
         end
       end
diff --git a/spec/helpers/invite_members_helper_spec.rb b/spec/helpers/invite_members_helper_spec.rb
index 16e4bee47c0..8f4e288d83a 100644
--- a/spec/helpers/invite_members_helper_spec.rb
+++ b/spec/helpers/invite_members_helper_spec.rb
@@ -94,4 +94,26 @@ RSpec.describe InviteMembersHelper do
       end
     end
   end
+
+  describe '#invite_accepted_notice' do
+    context 'for group invites' do
+      let_it_be(:group) { create(:group, name: 'My group') }
+      let_it_be(:member) { build(:group_member, :guest, group: group) }
+
+      it 'returns the expected message' do
+        expect(helper.invite_accepted_notice(member))
+          .to eq('You have been granted access to the My group group with the following role: Guest.')
+      end
+    end
+
+    context 'for project invites' do
+      let_it_be(:project) { create(:project, name: 'My project') }
+      let_it_be(:member) { build(:project_member, :guest, project: project) }
+
+      it 'returns the expected message' do
+        expect(helper.invite_accepted_notice(member))
+          .to eq('You have been granted access to the My project project with the following role: Guest.')
+      end
+    end
+  end
 end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index bbb5a77e89c..b285aaa0ee3 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1085,6 +1085,7 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
         is_expected.to have_body_text project.full_name
         is_expected.to have_body_text project.web_url
         is_expected.to have_body_text project_member.human_access
+        is_expected.to have_body_text 'default role'
         is_expected.to have_body_text 'leave the project'
         is_expected.to have_body_text project_url(project, leave: 1)
       end
@@ -1122,7 +1123,8 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
         it 'contains all the useful information' do
           is_expected.to have_subject "#{inviter.name} invited you to join GitLab"
           is_expected.to have_body_text project.full_name
-          is_expected.to have_body_text project_member.human_access.downcase
+          is_expected.to have_body_text project_member.human_access
+          is_expected.to have_body_text 'default role'
           is_expected.to have_body_text project_member.invite_token
           is_expected.to have_link(
             'Join now',
@@ -1140,7 +1142,8 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
         it 'contains all the useful information' do
           is_expected.to have_subject "Invitation to join the #{project.full_name} project"
           is_expected.to have_body_text project.full_name
-          is_expected.to have_body_text project_member.human_access.downcase
+          is_expected.to have_body_text project_member.human_access
+          is_expected.to have_body_text 'default role'
           is_expected.to have_body_text project_member.invite_token
           is_expected.to have_link(
             'Join now',
@@ -1796,7 +1799,7 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
         it 'contains all the useful information' do
           is_expected.to have_subject "#{group_member.created_by.name} invited you to join GitLab"
           is_expected.to have_body_text group.name
-          is_expected.to have_body_text group_member.human_access.downcase
+          is_expected.to have_body_text group_member.human_access
           is_expected.to have_body_text group_member.invite_token
         end
       end
@@ -1807,7 +1810,7 @@ RSpec.describe Notify, feature_category: :code_review_workflow do
         it 'contains all the useful information' do
           is_expected.to have_subject "Invitation to join the #{group.name} group"
           is_expected.to have_body_text group.name
-          is_expected.to have_body_text group_member.human_access.downcase
+          is_expected.to have_body_text group_member.human_access
           is_expected.to have_body_text group_member.invite_token
         end
       end
diff --git a/spec/presenters/member_presenter_spec.rb b/spec/presenters/member_presenter_spec.rb
index 7223c98d5f7..898f4288936 100644
--- a/spec/presenters/member_presenter_spec.rb
+++ b/spec/presenters/member_presenter_spec.rb
@@ -21,6 +21,12 @@ RSpec.describe MemberPresenter, feature_category: :groups_and_projects do
     end
   end
 
+  describe '#role_type' do
+    it "returns 'default'" do
+      expect(presenter.role_type).to eq('default')
+    end
+  end
+
   describe '#valid_level_roles' do
     it 'does not return levels lower than user highest membership in the hierarchy' do
       expect(described_class.new(subgroup_member).valid_level_roles).to eq(