From 42263d6451c0af3c0e7a61747ffb046a806e4477 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Mar 2020 00:07:41 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/scim.md | 2 +- doc/ci/variables/README.md | 9 ++++++--- doc/ci/yaml/README.md | 5 ++++- doc/user/project/deploy_tokens/index.md | 22 +++++++++++++++++++--- doc/user/search/index.md | 2 +- 5 files changed, 31 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/api/scim.md b/doc/api/scim.md index cdd635d0627..eaa56b0d0dd 100644 --- a/doc/api/scim.md +++ b/doc/api/scim.md @@ -122,7 +122,7 @@ Parameters: | `userName` | string | yes | Username of the user. | | `emails` | JSON string | yes | Work email. | | `name` | JSON string | yes | Name of the user. | -| `meta` | string | no | Resource type (`User'). | +| `meta` | string | no | Resource type (`User`). | Example request: diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 643ccd45898..c768c833e7c 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -571,9 +571,12 @@ Below you can find supported syntax reference: - `$VARIABLE =~ /^content.*/` - `$VARIABLE_1 !~ /^content.*/` (introduced in GitLab 11.11) - It is possible perform pattern matching against a variable and regular - expression. Expression like this evaluates to truth if matches are found - when using `=~`. It evaluates to truth if matches are not found when `!~` is used. + Variable pattern matching with regular expressions uses the + [RE2 regular expression syntax](https://github.com/google/re2/wiki/Syntax). + Expressions evaluate as `true` if: + + - Matches are found when using `=~`. + - Matches are *not* found when using `!~`. Pattern matching is case-sensitive by default. Use `i` flag modifier, like `/pattern/i` to make a pattern case-insensitive. diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 8931ee43a8a..255ae3f7c13 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -857,7 +857,10 @@ In this example, if the first rule: `rules:if` differs slightly from `only:variables` by accepting only a single expression string, rather than an array of them. Any set of expressions to be -evaluated should be conjoined into a single expression using `&&` or `||`. For example: +evaluated should be conjoined into a single expression using `&&` or `||`, and use +the [variable matching syntax](../variables/README.md#supported-syntax). + +For example: ```yaml job: diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md index 728f09ca787..4479653417c 100644 --- a/doc/user/project/deploy_tokens/index.md +++ b/doc/user/project/deploy_tokens/index.md @@ -9,11 +9,11 @@ at midnight UTC and that they can be only managed by [maintainers](../../permiss ## Creating a Deploy Token -You can create as many deploy tokens as you like from the settings of your project: +You can create as many deploy tokens as you like from the settings of your project. Alternatively, you can also create [group-scoped deploy tokens](#group-deploy-token). 1. Log in to your GitLab account. -1. Go to the project you want to create Deploy Tokens for. -1. Go to **Settings** > **Repository**. +1. Go to the project (or group) you want to create Deploy Tokens for. +1. Go to **{settings}** **Settings** > **CI / CD**. 1. Click on "Expand" on **Deploy Tokens** section. 1. Choose a name, expiry date (optional), and username (optional) for the token. 1. Choose the [desired scopes](#limiting-scopes-of-a-deploy-token). @@ -77,6 +77,22 @@ docker login -u -p registry.example.com Just replace `` and `` with the proper values. Then you can simply pull images from your Container Registry. +### Group Deploy Token + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/21765) in GitLab 12.9. + +A deploy token created at the group level can be used across all projects that +belong either to the specific group or to one of its subgroups. + +To use a group deploy token: + +1. [Create](#creating-a-deploy-token) a deploy token for a group. +1. Use it the same way you use a project deploy token when + [cloning a repository](#git-clone-a-repository). + +The scopes applied to a group deploy token (such as `read_repository`) will +apply consistently when cloning the repository of related projects. + ### GitLab Deploy Token > [Introduced][ce-18414] in GitLab 10.8. diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 70ab9af0bcc..407578fd4df 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -41,7 +41,7 @@ groups: - [Label](../project/labels.md) - My-reaction - Confidential - - Epic ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/195704) in GitLab 12.8) + - Epic ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/195704) in GitLab 12.9) - Search for this text 1. Select or type the operator to use for filtering the attribute. The following operators are available: -- cgit v1.2.3