From 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Dec 2019 15:07:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../pipelines_for_merged_results/merge_trains/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md') diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md index 44e63d46901..fca6916bee4 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md @@ -6,6 +6,7 @@ last_update: 2019-07-03 # Merge Trains **(PREMIUM)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0. +> [Squash and merge](../../../../user/project/merge_requests/squash_and_merge.md) support [introduced](https://gitlab.com/gitlab-org/gitlab/issues/13001) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.6. [Pipelines for merged results](../index.md#pipelines-for-merged-results-premium) introduces running a build on the result of the merged code prior to merging, as a way to keep master green. @@ -36,7 +37,6 @@ Merge trains have the following requirements and limitations: If more than twenty merge requests are added to the merge train, the merge requests will be queued until a slot in the merge train is free. There is no limit to the number of merge requests that can be queued. -- This feature does not support [squash and merge](../../../../user/project/merge_requests/squash_and_merge.md). Watch this video for a demonstration on [how parallel execution -- cgit v1.2.1