diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-03 06:09:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-03 06:09:41 +0300 |
| commit | 33edd7d08df07bf56e9b6c35c141650d27a13533 (patch) | |
| tree | 55f7d9e930d0e64c69c15a291a5b34e72e976db7 | |
| parent | f78aa88c769acebd95eca52b07169a57196a3318 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/ci/yaml/index.md | 8 | ||||
| -rw-r--r-- | doc/user/permissions.md | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index 10b603d4d92..811270d870c 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -2513,8 +2513,8 @@ job2: **Related topics**: - [Run your CI/CD jobs in Docker containers](../docker/using_docker_images.md). -- [How runner pull policies work](https://docs.gitlab.com/runner/executors/docker.html#how-pull-policies-work). -- [Using multiple pull policies](https://docs.gitlab.com/runner/executors/docker.html#using-multiple-pull-policies). +- [Configure how runners pull images](https://docs.gitlab.com/runner/executors/docker.html#configure-how-runners-pull-images). +- [Set multiple pull policies](https://docs.gitlab.com/runner/executors/docker.html#set-multiple-pull-policies). ### `inherit` @@ -4361,8 +4361,8 @@ job2: **Related topics**: - [Run your CI/CD jobs in Docker containers](../docker/using_docker_images.md). -- [How runner pull policies work](https://docs.gitlab.com/runner/executors/docker.html#how-pull-policies-work). -- [Using multiple pull policies](https://docs.gitlab.com/runner/executors/docker.html#using-multiple-pull-policies). +- [Configure how runners pull images](https://docs.gitlab.com/runner/executors/docker.html#configure-how-runners-pull-images). +- [Set multiple pull policies](https://docs.gitlab.com/runner/executors/docker.html#set-multiple-pull-policies). ### `stage` diff --git a/doc/user/permissions.md b/doc/user/permissions.md index ce3e6722a79..6b1ffee85c0 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -438,8 +438,8 @@ For more information, see Users with the Minimal Access role do not: -- Count as licensed seats on self-managed Ultimate subscriptions or any GitLab.com subscriptions. - Automatically have access to projects and subgroups in that root group. +- Count as licensed seats on self-managed Ultimate subscriptions or any GitLab.com subscriptions, provided the user has no other role anywhere in the instance or in the GitLab SaaS namespace. Owners must explicitly add these users to the specific subgroups and projects. |