diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-23 03:07:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-23 03:07:55 +0300 |
| commit | 82f96a9ae2529898de0e91ccfad1d6457f3c1975 (patch) | |
| tree | 7e189a0d2cef7df67aaa4f709e3f5bc312878cbd /doc/user | |
| parent | c50e042a392687730db9b8c2607883485b258ae4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/settings/index.md | 2 | ||||
| -rw-r--r-- | doc/user/clusters/agent/work_with_agent.md | 3 | ||||
| -rw-r--r-- | doc/user/group/compliance_frameworks.md | 19 |
3 files changed, 23 insertions, 1 deletions
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 2091191b889..c91b8f0b6b0 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -108,7 +108,7 @@ The **Metrics and profiling** settings contain: - [Metrics - Prometheus](../../../administration/monitoring/prometheus/gitlab_metrics.md) - Enable and configure Prometheus metrics. -- [Metrics - Grafana](../../../administration/monitoring/performance/grafana_configuration.md#integration-with-gitlab-ui) - +- [Metrics - Grafana](../../../administration/monitoring/performance/grafana_configuration.md#integrate-with-gitlab-ui) - Enable and configure Grafana. - [Profiling - Performance bar](../../../administration/monitoring/performance/performance_bar.md#enable-the-performance-bar-for-non-administrators) - Enable access to the Performance Bar for non-administrator users in a given group. diff --git a/doc/user/clusters/agent/work_with_agent.md b/doc/user/clusters/agent/work_with_agent.md index 2d54f67724e..b2e8ac6ef16 100644 --- a/doc/user/clusters/agent/work_with_agent.md +++ b/doc/user/clusters/agent/work_with_agent.md @@ -91,6 +91,9 @@ For more information about debugging, see [troubleshooting documentation](troubl > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327152) in GitLab 14.9. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336641) in GitLab 14.10, the agent token can be revoked from the UI. +> - Two-token limit [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/361030) in GitLab 16.1. + +An agent can have only two active tokens at one time. To reset the agent token without downtime: diff --git a/doc/user/group/compliance_frameworks.md b/doc/user/group/compliance_frameworks.md index 2fca8b7b678..77fca862a5b 100644 --- a/doc/user/group/compliance_frameworks.md +++ b/doc/user/group/compliance_frameworks.md @@ -397,3 +397,22 @@ You could also have the following `.gitlab-ci.yml` configuration: This configuration doesn't overwrite the compliance pipeline and you get the following message: `take compliance action`. + +### Prefilled variables are not shown + +Because of a [known issue](https://gitlab.com/gitlab-org/gitlab/-/issues/382857), +compliance pipelines in GitLab 15.3 and later can prevent +[prefilled variables](../../ci/pipelines/index.md#prefill-variables-in-manual-pipelines) +from appearing when manually starting a pipeline. + +To workaround this issue, use `ref: '$CI_COMMIT_SHA'` instead of `ref: '$CI_COMMIT_REF_NAME'` +in the `include:` statement that executes the individual project's configuration. + +The [example configuration](#example-configuration) has been updated with this change: + +```yaml +include: + - project: '$CI_PROJECT_PATH' + file: '$CI_CONFIG_PATH' + ref: '$CI_COMMIT_SHA' +``` |