From b8a931169e8f93e09fde498932dcacddb65e40b3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 9 Jun 2025 18:07:36 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .eslint_todo/vue-no-unused-properties.mjs     |  2 -
 GITALY_SERVER_VERSION                         |  2 +-
 .../boards/components/board_card.vue          | 51 +++++++++----------
 .../boards/components/board_card_inner.vue    | 30 +++++++----
 .../rapid_diffs/streaming_resource.rb         | 14 ++---
 .../merge_requests/_mr_title.html.haml        |  2 +-
 .../backfill_sentry_issues_namespace_id.yml   |  2 +-
 ...ex_to_provider_on_ldap_admin_role_links.rb | 17 +++++++
 ..._hk_backfill_sentry_issues_namespace_id.rb | 21 ++++++++
 db/schema_migrations/20250514232936           |  1 +
 db/schema_migrations/20250605024527           |  1 +
 db/structure.sql                              |  2 +
 doc/ci/examples/_index.md                     |  2 +-
 doc/ci/jobs/_index.md                         |  2 +-
 doc/ci/review_apps/_index.md                  |  2 +-
 doc/ci/runners/configure_runners.md           | 14 ++---
 doc/ci/runners/hosted_runners/windows.md      |  2 +-
 doc/ci/yaml/_index.md                         |  2 +-
 doc/ci/yaml/artifacts_reports.md              |  4 +-
 doc/ci/yaml/script.md                         |  2 +-
 doc/ci/yaml/signing_examples.md               |  6 +--
 doc/user/markdown.md                          | 43 ++++++++++++++++
 locale/gitlab.pot                             | 17 ++++++-
 .../rapid_diffs/streaming_resource_spec.rb    |  5 +-
 spec/features/groups/board_spec.rb            |  8 +--
 spec/frontend/boards/board_list_spec.js       |  2 +-
 .../boards/components/board_card_spec.js      |  2 +-
 .../boards/components/board_column_spec.js    |  1 +
 28 files changed, 187 insertions(+), 72 deletions(-)
 create mode 100644 db/migrate/20250605024527_add_index_to_provider_on_ldap_admin_role_links.rb
 create mode 100644 db/post_migrate/20250514232936_finalize_hk_backfill_sentry_issues_namespace_id.rb
 create mode 100644 db/schema_migrations/20250514232936
 create mode 100644 db/schema_migrations/20250605024527

diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs
index f1ef2e04495..e114be50465 100644
--- a/.eslint_todo/vue-no-unused-properties.mjs
+++ b/.eslint_todo/vue-no-unused-properties.mjs
@@ -293,8 +293,6 @@ export default {
     'ee/app/assets/javascripts/oncall_schedules/components/schedule/components/preset_weeks/weeks_header_item.vue',
     'ee/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/container_scanning_counts.vue',
     'ee/app/assets/javascripts/packages_and_registries/settings/project/components/dependency_proxy_packages_settings_form.vue',
-    'ee/app/assets/javascripts/product_analytics/onboarding/components/providers/self_managed_provider_card.vue',
-    'ee/app/assets/javascripts/product_analytics/onboarding/settings_instrumentation_instructions.vue',
     'ee/app/assets/javascripts/projects/components/move_personal_project_to_group_modal.vue',
     'ee/app/assets/javascripts/projects/merge_requests/blocking_mr_input_root.vue',
     'ee/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue',
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index e5c035e79af..4fcee4f2a75 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-333befa213dffe9a756658ebd1d85da5d32e8b11
+42c36c24adc64b5d1b0bb467873d67c923c8a612
diff --git a/app/assets/javascripts/boards/components/board_card.vue b/app/assets/javascripts/boards/components/board_card.vue
index b4b77bf4564..1e33a358140 100644
--- a/app/assets/javascripts/boards/components/board_card.vue
+++ b/app/assets/javascripts/boards/components/board_card.vue
@@ -127,7 +127,6 @@ export default {
         visitUrl(this.item.webUrl);
         return;
       }
-      e.preventDefault();
 
       const isMultiSelect = e.ctrlKey || e.metaKey;
       if (isMultiSelect && gon?.features?.boardMultiSelect) {
@@ -174,9 +173,7 @@ export default {
     changeFocusInColumn(currentCard, i) {
       // Building a list using data-col-index instead of just traversing the ul is necessary for swimlanes
       const columnCards = [
-        ...document.querySelectorAll(
-          `button.board-card-button[data-col-index="${this.columnIndex}"]`,
-        ),
+        ...document.querySelectorAll(`a.board-card-button[data-col-index="${this.columnIndex}"]`),
       ];
       const currentIndex = columnCards.indexOf(currentCard);
       if (currentIndex + i < 0 || currentIndex + i > columnCards.length - 1) {
@@ -206,7 +203,7 @@ export default {
         return;
       }
       // Focus the same index if possible, or last card
-      const targetCards = lists[currentIndex + i].querySelectorAll('button.board-card-button');
+      const targetCards = lists[currentIndex + i].querySelectorAll('a.board-card-button');
       if (targetCards.length <= this.index) {
         targetCards[targetCards.length - 1].focus();
       } else {
@@ -241,26 +238,28 @@ export default {
     data-testid="board-card"
     class="board-card gl-border gl-relative gl-mb-3 gl-rounded-base gl-border-section gl-bg-section gl-leading-normal hover:gl-bg-subtle dark:hover:gl-bg-gray-200"
   >
-    <button
-      :id="boardItemUniqueId"
-      :class="[
-        {
-          'focus:gl-bg-subtle dark:focus:gl-bg-gray-200': showFocusBackground,
-          'gl-border-l-4 gl-pl-4 gl-border-l-solid': itemColor,
-        },
-      ]"
-      :aria-label="item.title"
-      :data-col-index="columnIndex"
-      :data-row-index="rowIndex"
-      :style="cardStyle"
-      data-testid="board-card-button"
-      class="board-card-button gl-block gl-h-full gl-w-full gl-rounded-base gl-border-0 gl-bg-transparent gl-p-4 gl-text-left gl-outline-none focus:gl-focus"
-      @click="toggleIssue"
-      @keydown.left.exact.prevent="focusLeft"
-      @keydown.right.exact.prevent="focusRight"
-      @keydown.down.exact.prevent="focusNext"
-      @keydown.up.exact.prevent="focusPrev"
-    >
+    <div @click="toggleIssue">
+      <a
+        :id="boardItemUniqueId"
+        :class="[
+          {
+            'focus:gl-bg-subtle dark:focus:gl-bg-gray-200': showFocusBackground,
+            'gl-border-l-4 gl-pl-4 gl-border-l-solid': itemColor,
+          },
+        ]"
+        :href="item.webUrl"
+        :aria-label="item.title"
+        :data-col-index="columnIndex"
+        :data-row-index="rowIndex"
+        :style="cardStyle"
+        data-testid="board-card-button"
+        class="board-card-button gl-absolute gl-inset-0 gl-block gl-rounded-base gl-border-0 gl-bg-transparent gl-p-0 gl-outline-none focus:gl-focus"
+        @click.stop.prevent="toggleIssue"
+        @keydown.left.exact.prevent="focusLeft"
+        @keydown.right.exact.prevent="focusRight"
+        @keydown.down.exact.prevent="focusNext"
+        @keydown.up.exact.prevent="focusPrev"
+      ></a>
       <board-card-inner
         :list="list"
         :item="formattedItem"
@@ -271,6 +270,6 @@ export default {
       >
         <slot></slot>
       </board-card-inner>
-    </button>
+    </div>
   </li>
 </template>
diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue
index 58e756ef8e0..f155f05cc8c 100644
--- a/app/assets/javascripts/boards/components/board_card_inner.vue
+++ b/app/assets/javascripts/boards/components/board_card_inner.vue
@@ -255,10 +255,10 @@ export default {
 };
 </script>
 <template>
-  <div>
+  <div class="gl-p-4">
     <div class="gl-flex" dir="auto">
       <h4
-        class="board-card-title gl-mb-0 gl-mt-0 gl-min-w-0 gl-hyphens-auto gl-break-words gl-text-base"
+        class="board-card-title gl-isolate gl-mb-0 gl-mt-0 gl-min-w-0 gl-hyphens-auto gl-break-words gl-text-base"
         :class="{ 'gl-mr-6': hasActions }"
       >
         <gl-icon
@@ -291,6 +291,7 @@ export default {
           class="gl-text-default hover:gl-text-default"
           data-testid="board-card-title-link"
           @mousemove.stop
+          @click.prevent
           >{{ item.title }}</a
         >
       </h4>
@@ -320,7 +321,7 @@ export default {
           <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-5" />
           <span
             v-if="showBoardCardNumber"
-            class="board-card-number gl-mr-3 gl-gap-2 gl-overflow-hidden gl-text-sm gl-text-subtle"
+            class="board-card-number gl-isolate gl-mr-3 gl-gap-2 gl-overflow-hidden gl-text-sm gl-text-subtle"
             :class="{ 'gl-text-base': isEpicBoard }"
           >
             <work-item-type-icon
@@ -341,6 +342,7 @@ export default {
           </span>
           <epic-countables
             v-if="shouldRenderEpicCountables"
+            class="gl-isolate"
             :allow-sub-epics="allowSubEpics"
             :opened-epics-count="descendantCounts.openedEpics"
             :closed-epics-count="descendantCounts.closedEpics"
@@ -350,26 +352,35 @@ export default {
             :closed-issues-weight="descendantWeightSum.closedIssues"
           />
           <span v-if="!isEpicBoard">
-            <issue-weight v-if="validIssueWeight(item)" :weight="item.weight" />
+            <issue-weight v-if="validIssueWeight(item)" class="gl-isolate" :weight="item.weight" />
             <issue-milestone
               v-if="item.milestone"
               data-testid="issue-milestone"
               :milestone="item.milestone"
-              class="gl-mr-3 gl-inline-flex gl-max-w-15 gl-cursor-help gl-items-center gl-align-bottom gl-text-sm gl-text-subtle"
+              class="gl-isolate gl-mr-3 gl-inline-flex gl-max-w-15 gl-cursor-help gl-items-center gl-align-bottom gl-text-sm gl-text-subtle"
             />
             <issue-iteration
               v-if="item.iteration"
               data-testid="issue-iteration"
               :iteration="item.iteration"
-              class="gl-align-bottom"
+              class="gl-isolate gl-align-bottom"
             />
             <issue-due-date
               v-if="item.dueDate"
+              class="gl-isolate"
               :date="item.dueDate"
               :closed="Boolean(item.closedAt)"
             />
-            <issue-time-estimate v-if="item.timeEstimate" :estimate="item.timeEstimate" />
-            <issue-health-status v-if="item.healthStatus" :health-status="item.healthStatus" />
+            <issue-time-estimate
+              v-if="item.timeEstimate"
+              class="gl-isolate"
+              :estimate="item.timeEstimate"
+            />
+            <issue-health-status
+              v-if="item.healthStatus"
+              class="gl-isolate"
+              :health-status="item.healthStatus"
+            />
           </span>
         </span>
       </div>
@@ -402,7 +413,7 @@ export default {
         </div>
         <work-item-relationship-icons
           v-if="hasBlockingRelationships"
-          class="gl-whitespace-nowrap"
+          class="gl-isolate gl-whitespace-nowrap"
           :work-item-type="workItemType"
           :blocking-count="blockingCount"
           :blocked-by-count="blockedByCount"
@@ -414,6 +425,7 @@ export default {
         <div class="gl-max-w-20">
           <work-item-status-badge
             v-if="showStatus"
+            class="gl-isolate"
             :name="item.status.name"
             :icon-name="item.status.iconName"
             :color="item.status.color"
diff --git a/app/controllers/concerns/rapid_diffs/streaming_resource.rb b/app/controllers/concerns/rapid_diffs/streaming_resource.rb
index c04817aef5a..eec04a06d51 100644
--- a/app/controllers/concerns/rapid_diffs/streaming_resource.rb
+++ b/app/controllers/concerns/rapid_diffs/streaming_resource.rb
@@ -61,12 +61,6 @@ module RapidDiffs
     def stream_diff_files(options, view_context)
       return unless resource
 
-      if params.permit(:offset)[:offset].blank? && resource.first_diffs_slice(1, options).empty?
-        empty_state_component = ::RapidDiffs::EmptyStateComponent.new
-        response.stream.write empty_state_component.render_in(view_context)
-        return
-      end
-
       # NOTE: This is a temporary flag to test out the new diff_blobs
       if !!ActiveModel::Type::Boolean.new.cast(params.permit(:diff_blobs)[:diff_blobs])
         stream_diff_blobs(options, view_context)
@@ -78,6 +72,8 @@ module RapidDiffs
     def stream_diff_collection(options, view_context)
       diff_files = resource.diffs_for_streaming(options).diff_files(sorted: sorted?)
 
+      return render_empty_state if diff_files.empty?
+
       each_growing_slice(diff_files, 5, 2) do |slice|
         response.stream.write(render_diff_files_collection(slice, view_context))
       end
@@ -102,11 +98,17 @@ module RapidDiffs
     end
 
     def stream_diff_blobs(options, view_context)
+      return render_empty_state if resource.diffs_for_streaming(options).count == 0
+
       resource.diffs_for_streaming(options) do |diff_files_batch|
         response.stream.write(render_diff_files_collection(diff_files_batch, view_context))
       end
     end
 
+    def render_empty_state
+      response.stream.write render ::RapidDiffs::EmptyStateComponent.new
+    end
+
     def sorted?
       false
     end
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index cc80153230b..1c6321205f8 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -12,7 +12,7 @@
       - c.with_body do
         = _('The source project of this merge request has been removed.')
 
-  .detail-page-header.gl-flex.gl-pt-5.gl-gap-3.gl-flex-wrap.sm:gl-flex-nowrap.gl-mb-3.sm:gl-mb-0
+  .detail-page-header.gl-flex.gl-pt-5.gl-gap-3.gl-flex-wrap.sm:gl-flex-nowrap.gl-mb-3.sm:gl-mb-0{ class: ('is-merge-request' unless fluid_layout) }
     %h1.title.gl-heading-1.gl-self-center.gl-mb-0.gl-flex-1{ data: { testid: 'title-content' } }
       = markdown_field(@merge_request, :title)
 
diff --git a/db/docs/batched_background_migrations/backfill_sentry_issues_namespace_id.yml b/db/docs/batched_background_migrations/backfill_sentry_issues_namespace_id.yml
index 667118045c7..893c6894b68 100644
--- a/db/docs/batched_background_migrations/backfill_sentry_issues_namespace_id.yml
+++ b/db/docs/batched_background_migrations/backfill_sentry_issues_namespace_id.yml
@@ -5,4 +5,4 @@ feature_category: observability
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/174555
 milestone: '17.7'
 queued_migration_version: 20241203144837
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250514232936'
diff --git a/db/migrate/20250605024527_add_index_to_provider_on_ldap_admin_role_links.rb b/db/migrate/20250605024527_add_index_to_provider_on_ldap_admin_role_links.rb
new file mode 100644
index 00000000000..09d07c9fae0
--- /dev/null
+++ b/db/migrate/20250605024527_add_index_to_provider_on_ldap_admin_role_links.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddIndexToProviderOnLdapAdminRoleLinks < Gitlab::Database::Migration[2.3]
+  milestone '18.1'
+
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_ldap_admin_role_links_on_provider_and_sync_status'
+
+  def up
+    add_concurrent_index :ldap_admin_role_links, [:provider, :sync_status], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :ldap_admin_role_links, name: INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20250514232936_finalize_hk_backfill_sentry_issues_namespace_id.rb b/db/post_migrate/20250514232936_finalize_hk_backfill_sentry_issues_namespace_id.rb
new file mode 100644
index 00000000000..a6b94404b17
--- /dev/null
+++ b/db/post_migrate/20250514232936_finalize_hk_backfill_sentry_issues_namespace_id.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillSentryIssuesNamespaceId < Gitlab::Database::Migration[2.3]
+  milestone '18.1'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillSentryIssuesNamespaceId',
+      table_name: :sentry_issues,
+      column_name: :id,
+      job_arguments: [:namespace_id, :issues, :namespace_id, :issue_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250514232936 b/db/schema_migrations/20250514232936
new file mode 100644
index 00000000000..729f4cdcd73
--- /dev/null
+++ b/db/schema_migrations/20250514232936
@@ -0,0 +1 @@
+d67901ce906323e995a970538c1d942761164c1ab149ab5f52bf544224155c76
\ No newline at end of file
diff --git a/db/schema_migrations/20250605024527 b/db/schema_migrations/20250605024527
new file mode 100644
index 00000000000..6f3227de2dc
--- /dev/null
+++ b/db/schema_migrations/20250605024527
@@ -0,0 +1 @@
+30d1a9eccbd47c240c5b72bdf2c157a100b83f41e96b41906dab791658a7f6de
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 1daf7885ab5..0dcd270ee7d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -35744,6 +35744,8 @@ CREATE INDEX index_last_usages_on_last_used_date ON catalog_resource_component_l
 
 CREATE INDEX index_ldap_admin_role_links_on_member_role_id ON ldap_admin_role_links USING btree (member_role_id);
 
+CREATE INDEX index_ldap_admin_role_links_on_provider_and_sync_status ON ldap_admin_role_links USING btree (provider, sync_status);
+
 CREATE INDEX index_ldap_group_links_on_member_role_id ON ldap_group_links USING btree (member_role_id);
 
 CREATE UNIQUE INDEX index_lfs_file_locks_on_project_id_and_path ON lfs_file_locks USING btree (project_id, path);
diff --git a/doc/ci/examples/_index.md b/doc/ci/examples/_index.md
index c302b1323f0..a912737ebdc 100644
--- a/doc/ci/examples/_index.md
+++ b/doc/ci/examples/_index.md
@@ -20,7 +20,7 @@ Examples are available in several forms. As a collection of:
 - `.gitlab-ci.yml` [template files](#cicd-templates) maintained in GitLab, for many
   common frameworks and programming languages.
 - Repositories with [example projects](https://gitlab.com/gitlab-examples) for various languages. You can fork and adjust them to your own needs. Projects include an example of using [review apps with a static site served by NGINX](https://gitlab.com/gitlab-examples/review-apps-nginx/).
-- Examples and [other resources](#other-resources) listed below.
+- Examples and [other resources](#other-resources) listed in the following sections.
 
 ## CI/CD examples
 
diff --git a/doc/ci/jobs/_index.md b/doc/ci/jobs/_index.md
index 96de70bb09b..8b5f4aa5b25 100644
--- a/doc/ci/jobs/_index.md
+++ b/doc/ci/jobs/_index.md
@@ -312,7 +312,7 @@ separate each job name with a number and one of the following:
 
 You can use these symbols interchangeably.
 
-In the example below, these three jobs are in a group named `build ruby`:
+In the following example, these three jobs are in a group named `build ruby`:
 
 ```yaml
 build ruby 1/3:
diff --git a/doc/ci/review_apps/_index.md b/doc/ci/review_apps/_index.md
index eb5112dd9a2..bf310b45a4f 100644
--- a/doc/ci/review_apps/_index.md
+++ b/doc/ci/review_apps/_index.md
@@ -203,7 +203,7 @@ deploy_review:
   environment:
     name: review/${CI_COMMIT_REF_NAME}
     url: https://${CI_ENVIRONMENT_SLUG}.example.com
-    on_stop: stop_review_app  # References the stop job below
+    on_stop: stop_review_app  # References the stop_review_app job
 
 stop_review_app:
   stage: deploy
diff --git a/doc/ci/runners/configure_runners.md b/doc/ci/runners/configure_runners.md
index cf67c6c1995..eca393634a1 100644
--- a/doc/ci/runners/configure_runners.md
+++ b/doc/ci/runners/configure_runners.md
@@ -732,7 +732,7 @@ subcommand. However, `GIT_SUBMODULE_UPDATE_FLAGS` flags are appended after a few
 
 - `--init`, if [`GIT_SUBMODULE_STRATEGY`](#git-submodule-strategy) was set to `normal` or `recursive`.
 - `--recursive`, if [`GIT_SUBMODULE_STRATEGY`](#git-submodule-strategy) was set to `recursive`.
-- [`GIT_DEPTH`](#shallow-cloning). See the default value below.
+- `GIT_DEPTH`. See the default value in the [shallow cloning](#shallow-cloning) section.
 
 Git honors the last occurrence of a flag in the list of arguments, so manually
 providing them in `GIT_SUBMODULE_UPDATE_FLAGS` overrides these default flags.
@@ -740,7 +740,7 @@ providing them in `GIT_SUBMODULE_UPDATE_FLAGS` overrides these default flags.
 For example, you can use this variable to:
 
 - Fetch the latest remote `HEAD` instead of the tracked commit in the
-  repository (default) to automatically updated all submodules with the
+  repository (default) to automatically update all submodules with the
   `--remote` flag.
 - Speed up the checkout by fetching submodules in multiple parallel jobs with
   the `--jobs 4` flag.
@@ -767,14 +767,14 @@ it is better to explicitly track submodule commits as designed, and update them
 using an auto-remediation/dependency bot.
 
 The `--remote` flag is not required to check out submodules at their committed
-revisions. Use this flag only when you want to automatically updated submodules
+revisions. Use this flag only when you want to automatically update submodules
 to their latest remote versions.
 
 {{< /alert >}}
 
-The behavior of `--remote` depends on your Git version. Some Git versions might
-fail, with the error below, when the branch in the superproject's `.gitmodules`
-differs from the default branch of the submodule repository:
+The behavior of `--remote` depends on your Git version.
+If the branch specified in your superproject's `.gitmodules` file is different from the 
+default branch of the submodule repository, some Git versions will fail with this error:
 
 `fatal: Unable to find refs/remotes/origin/<branch> revision in submodule path '<submodule-path>'`
 
@@ -934,7 +934,7 @@ test:
 The value of `GIT_CLONE_PATH` expands once. You cannot nest variables
 in this value.
 
-For example, you define both the variables below in your
+For example, you define the following variables in your
 `.gitlab-ci.yml` file:
 
 ```yaml
diff --git a/doc/ci/runners/hosted_runners/windows.md b/doc/ci/runners/hosted_runners/windows.md
index ae5aa5f6adb..4bc598629b6 100644
--- a/doc/ci/runners/hosted_runners/windows.md
+++ b/doc/ci/runners/hosted_runners/windows.md
@@ -53,7 +53,7 @@ The `script` section of your `.gitlab-ci.yml` file therefore requires PowerShell
 
 ## Example `.gitlab-ci.yml` file
 
-Below is a sample `.gitlab-ci.yml` file that shows how to start using the runners for Windows:
+Use this example `.gitlab-ci.yml` file to get started with hosted runners on Windows:
 
 ```yaml
 .windows_job:
diff --git a/doc/ci/yaml/_index.md b/doc/ci/yaml/_index.md
index d6415c8460a..5cb815d897c 100644
--- a/doc/ci/yaml/_index.md
+++ b/doc/ci/yaml/_index.md
@@ -4358,7 +4358,7 @@ Use `retry:when` with `retry:max` to retry jobs for only specific failure cases.
 - A single failure type, or an array of one or more failure types:
 
 <!--
-  If you change any of the values below, make sure to update the `RETRY_WHEN_IN_DOCUMENTATION`
+  If you change any of the following values, make sure to update the `RETRY_WHEN_IN_DOCUMENTATION`
   array in `spec/lib/gitlab/ci/config/entry/retry_spec.rb`.
   The test there makes sure that all documented
   values are valid as a configuration option and therefore should always
diff --git a/doc/ci/yaml/artifacts_reports.md b/doc/ci/yaml/artifacts_reports.md
index 1362994052b..6573355b5e0 100644
--- a/doc/ci/yaml/artifacts_reports.md
+++ b/doc/ci/yaml/artifacts_reports.md
@@ -247,7 +247,7 @@ as a list of filenames, a filename pattern, or both:
 - A combination of both (`cyclonedx: [gl-sbom-*.json, my-cyclonedx.json]`).
 - Directories are not supported(`cyclonedx: test-results`, `cyclonedx: test-results/**`).
 
-Below is an example of a job exposing CycloneDX artifacts:
+The following example shows a job that exposes CycloneDX artifacts:
 
 ```yaml
 artifacts:
@@ -332,7 +332,7 @@ The collected Unit test reports upload to GitLab as an artifact. Although JUnit
 are many third-party ports for other languages such as JavaScript, Python, and Ruby.
 
 See [Unit test reports](../testing/unit_test_reports.md) for more details and examples.
-Below is an example of collecting a JUnit report format XML file from Ruby's RSpec test tool:
+The following example shows how to collect a JUnit XML report from Ruby RSpec tests:
 
 ```yaml
 rspec:
diff --git a/doc/ci/yaml/script.md b/doc/ci/yaml/script.md
index 48270e6f728..15797e1ffec 100644
--- a/doc/ci/yaml/script.md
+++ b/doc/ci/yaml/script.md
@@ -209,7 +209,7 @@ lines to form the command. Make sure the lines can run when concatenated.
 <!-- vale gitlab_base.MeaningfulLinkWords = NO -->
 
 [Shell here documents](https://en.wikipedia.org/wiki/Here_document) work with the
-`|` and `>` operators as well. The example below transliterates lowercase letters
+`|` and `>` operators as well. The following example transliterates lowercase letters
 to upper case:
 
 <!-- vale gitlab_base.MeaningfulLinkWords = YES -->
diff --git a/doc/ci/yaml/signing_examples.md b/doc/ci/yaml/signing_examples.md
index b32dbeaa493..944c8a60452 100644
--- a/doc/ci/yaml/signing_examples.md
+++ b/doc/ci/yaml/signing_examples.md
@@ -69,7 +69,7 @@ To learn more about signing containers, see [Cosign Signing Containers documenta
 
 #### Build artifacts
 
-The example below demonstrates how to sign a build artifact in GitLab CI. You should save the `cosign.bundle` file
+The following example demonstrates how to sign a build artifact in GitLab CI. You should save the `cosign.bundle` file
 produced by `cosign sign-blob`, which is used for signature verification.
 
 To learn more about signing artifacts, see [Cosign Signing Blobs documentation](https://docs.sigstore.dev/cosign/signing/signing_with_blobs/).
@@ -128,7 +128,7 @@ verify_image:
 
 #### Build artifacts
 
-The example below demonstrates how to verify a signed build artifact in GitLab CI. Verifying an artifact requires both
+The following example demonstrates how to verify a signed build artifact in GitLab CI. Verifying an artifact requires both
 the artifact itself and the `cosign.bundle` file produced by `cosign sign-blob`. Use the previously described [command-line arguments](#verification).
 
 ```yaml
@@ -209,7 +209,7 @@ audited 1 package in 0s
 ### Inspecting the provenance metadata
 
 The Rekor transparency log stores certificates and attestations for every package that is published with provenance.
-For example, here is the [entry for the below example](https://search.sigstore.dev/?logIndex=21076013).
+For example, here is the [entry for the following example](https://search.sigstore.dev/?logIndex=21076013).
 
 An example provenance document generated by npm:
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index bf741a8dc9b..3873fd75304 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -82,6 +82,7 @@ The following features are not found in standard Markdown:
 - [Front matter](#front-matter)
 - [GitLab-specific references](#gitlab-specific-references)
 - [Includes](#includes)
+- [Placeholders](#placeholders)
 - [Inline diffs](#inline-diff)
 - [Math equations and symbols written in LaTeX](#math-equations)
 - [Strikethrough](#emphasis)
@@ -1969,6 +1970,48 @@ When rendered, the example looks similar to:
 > alert(s);
 > ```
 
+## Placeholders
+
+{{< history >}}
+
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14389) in GitLab 18.1 [with a flag](../administration/feature_flags.md) named `markdown_placeholders`. Disabled by default. Enabled on GitLab.com for a subset of groups.
+
+{{< /history >}}
+
+{{< alert type="flag" >}}
+
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
+This feature is available for testing, but not ready for production use.
+
+{{< /alert >}}
+
+Use placeholders to display certain types of changing data in descriptions and comments,
+such as a project's title or latest tag.
+Placeholders are reloaded each time the Markdown is rendered, so for example, when you refresh a page.
+
+The syntax is `%{PLACEHOLDER}`.
+
+For example, you could add an image that would reference the current pipeline status for the default branch:
+
+```markdown
+![pipeline status](https://%{gitlab_server}/%{project_path}/badges/%{default_branch}/pipeline.svg)
+```
+
+| Placeholder               | Example value       | Description |
+|---------------------------|---------------------|-------------|
+| `%{gitlab_server}`        | `gitlab.com`        | Hostnamme of the GitLab instance. |
+| `%{gitlab_pages_domain}`  | `pages.gitlab.com`  | Domain hosting GitLab Pages. |
+| `%{project_path}`         | `gitlab-org/gitlab` | Path of a project including the parent groups. |
+| `%{project_name}`         | `gitlab`            | Name of the project. |
+| `%{project_id}`           | `278964`            | Database ID associated with the project. |
+| `%{project_namespace}`    | `gitlab-org`        | Project namespace of the project. |
+| `%{project_title}`        | `GitLab`            | Title of the project. |
+| `%{group_name}`           | `gitlab-org`        | Group of the project. |
+| `%{default_branch}`       | `main`              | Default branch name configured for a project's repository. |
+| `%{commit_sha}`           | `ad10e011ce65492322037633ebc054efde37b143` | ID of the most recent commit on the default branch of a project's repository. |
+| `%{latest_tag}`            | `v17.10.7-ee`       | Latest tag created in the project's repository. |
+
 ## Escape characters
 
 Markdown reserves the following ASCII characters to format the page:
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4cfc61ba2c0..53bffe9804c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -55341,6 +55341,9 @@ msgstr ""
 msgid "SecurityOrchestration| that is %{licenseState} and is"
 msgstr ""
 
+msgid "SecurityOrchestration| triggered by %{sources}"
+msgstr ""
+
 msgid "SecurityOrchestration|%d project which has compliance framework:"
 msgid_plural "SecurityOrchestration|%d projects which have compliance framework:"
 msgstr[0] ""
@@ -55387,6 +55390,9 @@ msgid_plural "SecurityOrchestration|%{scanners} of %{severities} severity levels
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "SecurityOrchestration|%{sources} or %{lastSource}"
+msgstr ""
+
 msgid "SecurityOrchestration|%{state} and %{statuses}"
 msgstr ""
 
@@ -55720,7 +55726,7 @@ msgstr ""
 msgid "SecurityOrchestration|Enforce the following pipeline execution policy:"
 msgstr ""
 
-msgid "SecurityOrchestration|Every time a pipeline runs for %{branches}%{branchExceptionsString}"
+msgid "SecurityOrchestration|Every time a pipeline runs for %{branches}%{pipelineSource}%{branchExceptionsString}"
 msgstr ""
 
 msgid "SecurityOrchestration|Except"
@@ -56559,6 +56565,12 @@ msgstr ""
 msgid "SecurityOrchestration|any branch"
 msgstr ""
 
+msgid "SecurityOrchestration|any branch that targets a protected branch"
+msgstr ""
+
+msgid "SecurityOrchestration|any branch that targets the default branch"
+msgstr ""
+
 msgid "SecurityOrchestration|any default branch"
 msgstr ""
 
@@ -57383,6 +57395,9 @@ msgstr ""
 msgid "Select health status"
 msgstr ""
 
+msgid "Select item"
+msgstr ""
+
 msgid "Select iteration"
 msgstr ""
 
diff --git a/spec/controllers/concerns/rapid_diffs/streaming_resource_spec.rb b/spec/controllers/concerns/rapid_diffs/streaming_resource_spec.rb
index 8473033f9eb..b5213f7b666 100644
--- a/spec/controllers/concerns/rapid_diffs/streaming_resource_spec.rb
+++ b/spec/controllers/concerns/rapid_diffs/streaming_resource_spec.rb
@@ -78,6 +78,8 @@ RSpec.describe RapidDiffs::StreamingResource, type: :controller, feature_categor
     it 'renders diffs' do
       controller_instance.send(:diffs)
       expect(response.stream).to have_received(:write).with(diffs_html)
+      # ensure we're not doing double work when checking for empty state
+      expect(mock_resource).to have_received(:diffs_for_streaming).once
     end
 
     context 'when no diffs and no offset' do
@@ -85,7 +87,8 @@ RSpec.describe RapidDiffs::StreamingResource, type: :controller, feature_categor
 
       before do
         allow(controller_instance).to receive(:params).and_return(ActionController::Parameters.new)
-        allow(RapidDiffs::EmptyStateComponent).to receive_message_chain(:new, :render_in).and_return(empty_state_html)
+        allow(controller_instance).to receive(:render), &:call
+        allow(RapidDiffs::EmptyStateComponent).to receive_message_chain(:new, :call).and_return(empty_state_html)
       end
 
       it 'renders empty state' do
diff --git a/spec/features/groups/board_spec.rb b/spec/features/groups/board_spec.rb
index a4ceab5812c..0281bdaa929 100644
--- a/spec/features/groups/board_spec.rb
+++ b/spec/features/groups/board_spec.rb
@@ -100,17 +100,17 @@ RSpec.describe 'Group Boards', feature_category: :portfolio_management do
     context "when user is navigating via keyboard", :js do
       it 'allows user to traverse cards forward and backward across board columns' do
         # Focus issue2 in Open list then move to issue1 in list2 and back
-        click_button 'issue2'
+        find('a.board-card-button[data-col-index="0"]').click
 
-        expect(page).to have_selector('button.board-card-button[data-col-index="0"]', focused: true)
+        expect(page).to have_selector('.board-card-button[data-col-index="0"]', focused: true)
 
         send_keys :right
 
-        expect(page).to have_selector('button.board-card-button[data-col-index="2"]', focused: true)
+        expect(page).to have_selector('.board-card-button[data-col-index="2"]', focused: true)
 
         send_keys :left
 
-        expect(page).to have_selector('button.board-card-button[data-col-index="0"]', focused: true)
+        expect(page).to have_selector('.board-card-button[data-col-index="0"]', focused: true)
       end
     end
   end
diff --git a/spec/frontend/boards/board_list_spec.js b/spec/frontend/boards/board_list_spec.js
index 0d7b51c7607..6d833da83fa 100644
--- a/spec/frontend/boards/board_list_spec.js
+++ b/spec/frontend/boards/board_list_spec.js
@@ -27,7 +27,7 @@ describe('Board list component', () => {
   const findMoveToPositionComponent = () => wrapper.findComponent(BoardCardMoveToPosition);
   const findIntersectionObserver = () => wrapper.findComponent(GlIntersectionObserver);
   const findBoardListCount = () => wrapper.find('.board-list-count');
-  const findBoardCardButtons = () => wrapper.findAll('button.board-card-button');
+  const findBoardCardButtons = () => wrapper.findAll('a.board-card-button');
 
   const maxIssueWeightOrCountWarningClass = '.gl-bg-red-50';
 
diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js
index 2a976771f3b..7d9e479844a 100644
--- a/spec/frontend/boards/components/board_card_spec.js
+++ b/spec/frontend/boards/components/board_card_spec.js
@@ -18,7 +18,7 @@ jest.mock('~/lib/utils/url_utility');
 describe('Board card', () => {
   let wrapper;
 
-  const findBoardCardButton = () => wrapper.find('button.board-card-button');
+  const findBoardCardButton = () => wrapper.find('a.board-card-button');
 
   Vue.use(VueApollo);
 
diff --git a/spec/frontend/boards/components/board_column_spec.js b/spec/frontend/boards/components/board_column_spec.js
index b3ea2ca1163..fac7746e2c3 100644
--- a/spec/frontend/boards/components/board_column_spec.js
+++ b/spec/frontend/boards/components/board_column_spec.js
@@ -37,6 +37,7 @@ describe('Board Column Component', () => {
         highlightedLists,
         canAdminList,
         last,
+        columnIndex: 0,
       },
       stubs: {
         BoardAddNewColumnBetween,