Commit 67751440 authored by Evan Read's avatar Evan Read

Merge branch 'docs-make-message-bold' into 'master'

Make a note in the docs-lint links job bolded

See merge request gitlab-org/gitlab!49201
parents d2d121d5 41f78c0f
......@@ -70,8 +70,8 @@ docs-lint links:
# Don't delete the documentation/index.md, which is a false positive for the simple grep.
- grep -rl "redirect_to:" /tmp/gitlab-docs/content/ee/ | grep -v "development/documentation/index.md" | xargs rm -f
- bundle exec nanoc
- echo -e "\e[96mThe following test fails when a doc links to a redirect file."
- echo -e "\e[96mMake sure all links point to the correct page."
- echo -e "\e[1;96mThe following test fails when a doc links to a redirect file."
- echo -e "\e[1;96mMake sure all links point to the correct page."
- bundle exec nanoc check internal_links
# Check the internal anchor links
- bundle exec nanoc check internal_anchors
......
......@@ -1004,9 +1004,6 @@ docker build:
allow_failure: true
```
Additional job configuration may be added to rules in the future. If something
useful is not available, please [open an issue](https://gitlab.com/gitlab-org/gitlab/-/issues).
#### Rules clauses
Available rule clauses are:
......@@ -1612,8 +1609,8 @@ Feature.enable(:allow_unsafe_ruby_regexp)
### `only`/`except` (advanced)
GitLab supports both simple and complex strategies, so it's possible to use an
array and a hash configuration scheme.
GitLab supports multiple strategies, and it's possible to use an
array or a hash configuration scheme.
Four keys are available:
......@@ -2556,9 +2553,6 @@ To follow progress on support for GitLab-managed clusters, see the
#### Dynamic environments
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/21971) in GitLab 8.12 and GitLab Runner 1.6.
> - The `$CI_ENVIRONMENT_SLUG` was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/22864) in GitLab 8.15.
Use CI/CD [variables](../variables/README.md) to dynamically name environments.
For example:
......@@ -3273,8 +3267,6 @@ and bring back the old behavior.
### `coverage`
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/20428) in GitLab 8.17.
Use `coverage` to configure how code coverage is extracted from the
job output.
......@@ -3513,9 +3505,9 @@ In [GitLab 13.5](https://gitlab.com/gitlab-org/gitlab/-/issues/201938) and later
can use [`when:manual`](#whenmanual) in the same job as `trigger`. In GitLab 13.4 and
earlier, using them together causes the error `jobs:#{job-name} when should be on_success, on_failure or always`.
#### Simple `trigger` syntax for multi-project pipelines
#### Basic `trigger` syntax for multi-project pipelines
The simplest way to configure a downstream trigger is to use `trigger` keyword
You can configure a downstream trigger by using the `trigger` keyword
with a full path to a downstream project:
```yaml
......
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