diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-04-22 12:24:28 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-04-22 12:24:28 +0000 |
| commit | a52ed61510d5b6aa3a5dc972feec0e90dad0d9fc (patch) | |
| tree | 4a82ff53615c8751900471d042e2496216c15fc3 | |
| parent | b2f2e8174935c3550d61d216220c9580e9183b83 (diff) | |
| download | gitlab-ce-docs-fix-pipelines-merged-results.tar.gz | |
Update index.mddocs-fix-pipelines-merged-results
| -rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 6a03ab910fc..3c26a38e3de 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -67,7 +67,7 @@ when a merge request was created or updated. For example:  -## Combined ref pipelines **[PREMIUM]** +## Pipelines for Merged Results **[PREMIUM]** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/7380) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.10. @@ -93,7 +93,7 @@ The detached state serves to warn you that you are working in a situation subjected to merge problems, and helps to highlight that you should get out of WIP status or resolve merge conflicts as soon as possible. -### Enabling combined ref pipelines +### Enabling Pipelines for Merged Results This feature disabled by default until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186). It can be enabled at the project level: @@ -103,7 +103,7 @@ This feature disabled by default until we resolve issues with [contention handli  -### Combined ref pipeline's limitations +### Pipelines for Merged Result's limitations - This feature requires [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner) 11.9 or newer. - This feature requires [Gitaly](https://gitlab.com/gitlab-org/gitaly) 1.21.0 or newer. |