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
a4bf32df
Commit
a4bf32df
authored
Jul 06, 2021
by
Marcel Amirault
Committed by
Evan Read
Jul 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update link test image version
parent
73d9e029
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
.gitlab/ci/docs.gitlab-ci.yml
.gitlab/ci/docs.gitlab-ci.yml
+1
-1
doc/ci/pipelines/pipelines_for_merged_results.md
doc/ci/pipelines/pipelines_for_merged_results.md
+1
-1
No files found.
.gitlab/ci/docs.gitlab-ci.yml
View file @
a4bf32df
...
...
@@ -53,7 +53,7 @@ docs-lint markdown:
docs-lint links
:
extends
:
-
.docs:rules:docs-lint
image
:
registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.13-ruby-2.7.2
image
:
registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.13-ruby-2.7.2
-d2b92621
stage
:
test
needs
:
[]
script
:
...
...
doc/ci/pipelines/pipelines_for_merged_results.md
View file @
a4bf32df
...
...
@@ -87,7 +87,7 @@ For more information, read the [documentation on Merge Trains](merge_trains.md).
GitLab CI/CD can detect the presence of redundant pipelines, and cancels them
to conserve CI resources.
When a user merges a merge request immediately
with
in an ongoing merge
When a user merges a merge request immediately in an ongoing merge
train, the train is reconstructed, because it recreates 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.
...
...
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