diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 09:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 09:07:59 +0300 |
| commit | 74673d04d25ffed35cbcf17cd42969bed0a4e705 (patch) | |
| tree | b28828d7c8952e4a87dea3bcf44aa5d5756ffc00 | |
| parent | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/ci/yaml/README.md | 4 | ||||
| -rw-r--r-- | doc/integration/akismet.md | 4 | ||||
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index c5aae5ffd28..84e0bb873a7 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -3701,6 +3701,10 @@ test:mysql: You can see that the hidden keys are conveniently used as templates. +NOTE: **Note:** +You can't use YAML anchors across multiple files when leveraging the [`include`](#include) +feature. Anchors are only valid within the file they were defined in. + ## Triggers Triggers can be used to force a rebuild of a specific branch, tag or commit, diff --git a/doc/integration/akismet.md b/doc/integration/akismet.md index cb8f25d2895..5b697d387e9 100644 --- a/doc/integration/akismet.md +++ b/doc/integration/akismet.md @@ -24,9 +24,9 @@ To use Akismet: 1. Click on **Show** to reveal the API key. -1. Go to Applications Settings on Admin Area (`admin/application_settings`) +1. Go to **Admin Area > Settings > Reporting** (`/admin/application_settings/reporting`). -1. Check the **Enable Akismet** checkbox +1. Check the **Enable Akismet** checkbox. 1. Fill in the API key from step 3. diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index cfb12acb83b..ae04dbab1a0 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -878,6 +878,8 @@ functions:deploy: image: registry.gitlab.com/gitlab-org/gitlabktl:0.5.0 ``` -Different versions are available by changing the version tag at the end of the registry URL: `registry.gitlab.com/gitlab-org/gitlabktl:VERSION` +Different versions are available by changing the version tag at the end of the registry URL in the +format `registry.gitlab.com/gitlab-org/gitlabktl:<version>`. -For a full inventory of available `gitlabktl` versions please see [this list](https://gitlab.com/gitlab-org/gitlabktl/container_registry) +For a full inventory of available `gitlabktl` versions, see the `gitlabktl` project's +[container registry](https://gitlab.com/gitlab-org/gitlabktl/container_registry). |