Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1e0867de
Commit
1e0867de
authored
Sep 06, 2019
by
Sean Carroll
Committed by
Marcia Ramos
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow up documentation for Merge Trains cancel when running
parent
a1d099a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
0 deletions
+19
-0
changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml
...up-documentation-for-merge-trains-cancel-when-running.yml
+5
-0
doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
...e_request_pipelines/pipelines_for_merged_results/index.md
+14
-0
No files found.
changelogs/unreleased/66616-follow-up-documentation-for-merge-trains-cancel-when-running.yml
0 → 100644
View file @
1e0867de
---
title
:
Update merge train documentation
merge_request
:
32218
author
:
type
:
changed
doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
View file @
1e0867de
...
...
@@ -61,6 +61,20 @@ CAUTION: **Warning:**
Make sure your
`gitlab-ci.yml`
file is
[
configured properly for pipelines for merge requests
](
../index.md#configuring-pipelines-for-merge-requests
)
,
otherwise pipelines for merged results won't run and your merge requests will be stuck in an unresolved state.
## Automatic pipeline cancelation
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/12996) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3.
GitLab CI can detect the presence of redundant pipelines,
and will cancel them automatically in order to conserve CI resources.
When a user merges a merge request immediately within an ongoing merge
train, the train will be reconstructed, as it will recreate the expected
post-merge commit and pipeline. In this case, the merge train may already
have pipelines running against the previous expected post-merge commit.
These pipelines are considered redundant and will be automatically
canceled.
## Troubleshooting
### Pipelines for merged results not created even with new change pushed to merge request
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment