diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 12:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 12:09:53 +0300 |
| commit | 915a5b6e89195aab5d7eb0deb16e4825cfce509e (patch) | |
| tree | e54f4a19516ac2418a7830340194b26bcafcbae2 /doc | |
| parent | c2bfdff5d32c238ccc90b1c688b0a14479b3737e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/variables/index.md | 5 | ||||
| -rw-r--r-- | doc/development/snowplow/schemas.md | 1 | ||||
| -rw-r--r-- | doc/integration/jira/issues.md | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md index 309d631ce07..e9182410958 100644 --- a/doc/ci/variables/index.md +++ b/doc/ci/variables/index.md @@ -293,6 +293,11 @@ Use the variables in a job script like this: kubectl config set-cluster e2e --server="$KUBE_URL" --certificate-authority="$KUBE_CA_PEM" ``` +WARNING: +Be careful when assigning the value of a file variable to another variable. The other +variable takes the content of the file as its value, **not** the path to the file. +See [issue 29407](https://gitlab.com/gitlab-org/gitlab/-/issues/29407) for more details. + An alternative to `File` type variables is to: - Read the value of a CI/CD variable (`variable` type). diff --git a/doc/development/snowplow/schemas.md b/doc/development/snowplow/schemas.md index 5b9e4f5256e..f66e0566a9c 100644 --- a/doc/development/snowplow/schemas.md +++ b/doc/development/snowplow/schemas.md @@ -18,6 +18,7 @@ The [`StandardContext`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/g |----------------|---------------------|-----------------------|---------------------------------------------------------------------------------------------| | `project_id` | **{dotted-circle}** | integer | | | `namespace_id` | **{dotted-circle}** | integer | | +| `user_id` | **{dotted-circle}** | integer | User database record ID attribute. This file undergoes a pseudonymization process at the collector level. | | `environment` | **{check-circle}** | string (max 32 chars) | Name of the source environment, such as `production` or `staging` | | `source` | **{check-circle}** | string (max 32 chars) | Name of the source application, such as `gitlab-rails` or `gitlab-javascript` | | `plan` | **{dotted-circle}** | string (max 32 chars) | Name of the plan for the namespace, such as `free`, `premium`, or `ultimate`. Automatically picked from the `namespace`. | diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md index b8955c7b332..e24862242e1 100644 --- a/doc/integration/jira/issues.md +++ b/doc/integration/jira/issues.md @@ -140,7 +140,7 @@ Enhancements to use these filters through the user interface ## Automatic issue transitions -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/...) in GitLab 13.10. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55773) in GitLab 13.11. When you configure automatic issue transitions, you can transition a referenced Jira issue to the next available status with a category of **Done**. To configure |