Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-15 15:09:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-15 15:09:24 +0300
commit7912017a137da35c48071a048c99d27737c29f0f (patch)
treed967751ff35db3fb9ca788a36982a3f1f25bed92 /doc/development/pipelines
parent25fdad39f53eb46b346076fd07bc2db9bc1d8ccb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/pipelines')
-rw-r--r--doc/development/pipelines/index.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/pipelines/index.md b/doc/development/pipelines/index.md
index 26b3c7558cf..caffd121ca4 100644
--- a/doc/development/pipelines/index.md
+++ b/doc/development/pipelines/index.md
@@ -146,9 +146,9 @@ merge request. This prevents `rspec fail-fast` duration from exceeding the avera
This number can be overridden by setting a CI/CD variable named `RSPEC_FAIL_FAST_TEST_FILE_COUNT_THRESHOLD`.
-## Faster feedback when reverting merge requests
+## Faster feedback for merge requests that fix a broken `master`
-When you need to revert a merge request, to get accelerated feedback, you can add the `~pipeline:revert` label to your merge request.
+When you need to [fix a broken `master`](https://about.gitlab.com/handbook/engineering/workflow/#resolution-of-broken-master), you can add the `pipeline:expedite-master-fixing` label to expedite the pipelines that run on the merge request.
When this label is assigned, the following steps of the CI/CD pipeline are skipped:
@@ -158,6 +158,8 @@ When this label is assigned, the following steps of the CI/CD pipeline are skipp
Apply the label to the merge request, and run a new pipeline for the MR.
+Note that the merge request also needs to have the `master:broken` or `master:foss-broken` label set.
+
## Test jobs
We have dedicated jobs for each [testing level](../testing_guide/testing_levels.md) and each job runs depending on the