Commit 2e9d11a6 authored by Evan Read's avatar Evan Read

Merge branch 'docs-update-link-test-image' into 'master'

Update link test image version

See merge request gitlab-org/gitlab!64751
parents 0ffc0915 a4bf32df
...@@ -53,7 +53,7 @@ docs-lint markdown: ...@@ -53,7 +53,7 @@ docs-lint markdown:
docs-lint links: docs-lint links:
extends: extends:
- .docs:rules:docs-lint - .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 stage: test
needs: [] needs: []
script: script:
......
...@@ -87,7 +87,7 @@ For more information, read the [documentation on Merge Trains](merge_trains.md). ...@@ -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 GitLab CI/CD can detect the presence of redundant pipelines, and cancels them
to conserve CI resources. to conserve CI resources.
When a user merges a merge request immediately within 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 train, the train is reconstructed, because it recreates the expected
post-merge commit and pipeline. In this case, the merge train may already post-merge commit and pipeline. In this case, the merge train may already
have pipelines running against the previous expected post-merge commit. have pipelines running against the previous expected post-merge commit.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment