root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2019-12-17 06:07:59 +00:00
parent 9763c08170
commit 74673d04d2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ci/yaml/README.md
View File

@ -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,

4
doc/integration/akismet.md
View File

@ -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.

6
doc/user/project/clusters/serverless/index.md
View File

@ -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).