Add latest changes from gitlab-org/gitlab@master

config/feature_flags/development/merge_trains_skip_train.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422111
 milestone: '16.4'
 type: development
 group: group::pipeline execution
-default_enabled: false
+default_enabled: true

doc/ci/pipelines/merge_trains.md

@@ -176,6 +176,52 @@ NOTE:
 The **merge immediately** option may not be available if your project utilizes the [fast-forward](../../user/project/merge_requests/methods/index.md#fast-forward-merge) 
 merge method and the source branch is behind the target branch. See [issue 434070](https://gitlab.com/gitlab-org/gitlab/-/issues/434070) for more details.
 
+### Allow merge trains to be skipped to merge immediately without restarting merge train pipelines
+
+DETAILS:
+**Status:** Experiment
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/414505) in GitLab 16.5 [with a flag](../../administration/feature_flags.md) named `merge_trains_skip_train`. Disabled by default.
+> - [Enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/422111) as an [experiment feature](../../policy/experiment-beta-support.md) in GitLab 16.10.
+
+FLAG:
+On self-managed GitLab, by default this feature is available. To hide the feature,
+an administrator can [disable the feature flag](../../administration/feature_flags.md)
+named `merge_trains_skip_train`. On GitLab.com and GitLab Dedicated, this feature is available.
+
+You can allow merge requests to be merged without completely restarting a running merge train.
+Use this feature to quickly merge changes that can safely skip the pipeline, for example
+minor documentation updates.
+
+Skipping merge trains is an experimental feature. It may change or be removed completely in future releases.
+
+WARNING:
+You can use this feature to quickly merge security or bug fixes, but the changes
+in the merge request that skipped the train are not verified against
+any of the other merge requests in the train. If these other merge train pipelines
+complete successfully and merge, there is a risk that the combined changes are incompatible.
+The target branch could then require additional work to resolve the new failures.
+
+Prerequisites:
+
+- You must have the Maintainer role.
+- You must have [Merge trains enabled](#enable-merge-trains).
+
+To enable skipping the train without pipeline restarts:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Settings > Merge requests**.
+1. In the **Merge options** section, ensure the **Enable merged results pipelines**
+   and **Enable merge trains** options are enabled.
+1. Select **Allow skipping the merge train**.
+1. Select **Save changes**.
+
+To merge a merge request by skipping the merge train, use the [merge requests merge API endpoint](../../api/merge_requests.md#merge-a-merge-request)
+to merge with the attribute `skip_merge_train` set to `true`.
+
+The merge request merges, and the existing merge train pipelines are not cancelled
+or restarted.
+
 ## Troubleshooting
 
 ### Merge request dropped from the merge train

locale/gitlab.pot

@@ -39519,6 +39519,9 @@ msgstr ""
 msgid "ProjectSettings|Combine git tags with release notes, release evidence, and assets to create a release."
 msgstr ""
 
+msgid "ProjectSettings|Commits in earlier merge train pipelines might not get validated with immediately merged commits. "
+msgstr ""
+
 msgid "ProjectSettings|Configure %{link_start}data sources%{link_end} to be used for your dashboards."
 msgstr ""
 
@@ -39696,7 +39699,7 @@ msgstr ""
 msgid "ProjectSettings|Merge requests approved for merge are queued, and pipelines validate the combined results of the source and target branches before merge. %{link_start}What are merge trains?%{link_end}"
 msgstr ""
 
-msgid "ProjectSettings|Merge requests can be set to merge immediately without interrupting the merge train. Commits in earlier merge train pipelines might not get validated with immediately merged commits."
+msgid "ProjectSettings|Merge requests can be set to merge immediately without restarting pipelines for other trains in the queue. "
 msgstr ""
 
 msgid "ProjectSettings|Merge suggestions"
@@ -39873,6 +39876,9 @@ msgstr ""
 msgid "ProjectSettings|These checks must pass before merge requests can be merged."
 msgstr ""
 
+msgid "ProjectSettings|This feature is an experiment. When you enable this, you accept the %{link}."
+msgstr ""
+
 msgid "ProjectSettings|This project"
 msgstr ""