diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:08:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:08:02 +0300 |
| commit | 8a560d56661f56804ddf6596f928e7d25db37443 (patch) | |
| tree | ccae82652acd898e2c67120379c610c212b1aed0 /doc/ci | |
| parent | cf7a32bf29a7412a0f4b373ac3045f2555762d03 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/pipelines/merge_trains.md | 6 | ||||
| -rw-r--r-- | doc/ci/troubleshooting.md | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ci/pipelines/merge_trains.md b/doc/ci/pipelines/merge_trains.md index 548acc147f5..ee1c08c4df8 100644 --- a/doc/ci/pipelines/merge_trains.md +++ b/doc/ci/pipelines/merge_trains.md @@ -216,6 +216,12 @@ You can find reason the merge request was dropped from the merge train in the sy notes. Check the **Activity** section in the **Overview** tab for a message similar to: `User removed this merge request from the merge train because ...` +### Cannot use auto-merge + +You cannot use [auto-merge](../../user/project/merge_requests/merge_when_pipeline_succeeds.md) +(formerly **Merge when pipeline succeeds**) to skip the merge train, when merge trains are enabled. +See [issue 12267](https://gitlab.com/gitlab-org/gitlab/-/issues/12267) for more information. + ### Cannot retry merge train pipeline cannot When a merge train pipeline fails, the merge request is dropped from the train and the pipeline can't be retried. diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md index ceecb020044..c56ca439c83 100644 --- a/doc/ci/troubleshooting.md +++ b/doc/ci/troubleshooting.md @@ -396,7 +396,7 @@ Earlier jobs are already canceled by a periodic background worker (`StuckCiJobsW The following commands are run in the [rails console](../administration/operations/rails_console.md#starting-a-rails-console-session). WARNING: -Any command that changes data directly could be damaging if not run correctly, or under the right conditions. +Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case. ### Cancel stuck pending pipelines |