Commit d00a3170 authored by Evan Read's avatar Evan Read

Merge branch 'docs/group-project-access-token-bot-rename' into 'master'

Align bot user for projects/groups term within docs

See merge request gitlab-org/gitlab!78724
parents 5d535993 5a21495d
...@@ -58,7 +58,7 @@ POST groups/:id/access_tokens ...@@ -58,7 +58,7 @@ POST groups/:id/access_tokens
|-----------|---------|----------|---------------------| |-----------|---------|----------|---------------------|
| `id` | integer or string | yes | The ID or [URL-encoded path of the group](index.md#namespaced-path-encoding) | | `id` | integer or string | yes | The ID or [URL-encoded path of the group](index.md#namespaced-path-encoding) |
| `name` | String | yes | The name of the group access token | | `name` | String | yes | The name of the group access token |
| `scopes` | `Array[String]` | yes | [List of scopes](../user/project/settings/project_access_tokens.md#scopes-for-a-project-access-token) | | `scopes` | `Array[String]` | yes | [List of scopes](../user/group/settings/group_access_tokens.md#scopes-for-a-group-access-token) |
| `access_level` | Integer | no | A valid access level. Default value is 40 (Maintainer). Other allowed values are 10 (Guest), 20 (Reporter), and 30 (Developer). | | `access_level` | Integer | no | A valid access level. Default value is 40 (Maintainer). Other allowed values are 10 (Guest), 20 (Reporter), and 30 (Developer). |
| `expires_at` | Date | no | The token expires at midnight UTC on that date | | `expires_at` | Date | no | The token expires at midnight UTC on that date |
......
...@@ -84,7 +84,8 @@ from the users' list, with the `exclude_internal=true` parameter, ...@@ -84,7 +84,8 @@ from the users' list, with the `exclude_internal=true` parameter,
- Alert bot - Alert bot
- Support bot - Support bot
However, this action does not exclude [project bot users](../user/project/settings/project_access_tokens.md#project-bot-users). However, this action does not exclude [bot users for projects](../user/project/settings/project_access_tokens.md#bot-users-for-projects)
or [bot users for groups](../user/group/settings/group_access_tokens.md#bot-users-for-groups).
```plaintext ```plaintext
GET /users?exclude_internal=true GET /users?exclude_internal=true
......
...@@ -44,8 +44,21 @@ are scoped to a project. As with [Personal access tokens](#personal-access-token ...@@ -44,8 +44,21 @@ are scoped to a project. As with [Personal access tokens](#personal-access-token
- The GitLab registry. - The GitLab registry.
You can limit the scope and expiration date of project access tokens. When you You can limit the scope and expiration date of project access tokens. When you
create a project access token, GitLab creates a [project bot user](../user/project/settings/project_access_tokens.md#project-bot-users). Project create a project access token, GitLab creates a [bot user for projects](../user/project/settings/project_access_tokens.md#bot-users-for-projects).
bot users are service accounts and do not count as licensed seats. Bot users for projects are service accounts and do not count as licensed seats.
## Group access tokens
[Group access tokens](../user/group/settings/group_access_tokens.md#group-access-tokens)
are scoped to a group. As with [Personal access tokens](#personal-access-tokens), you can use them to authenticate with:
- The GitLab API.
- GitLab repositories.
- The GitLab registry.
You can limit the scope and expiration date of group access tokens. When you
create a group access token, GitLab creates a [bot user for groups](../user/group/settings/group_access_tokens.md#bot-users-for-groups).
Bot users for groups are service accounts and do not count as licensed seats.
## Deploy tokens ## Deploy tokens
......
...@@ -81,7 +81,7 @@ Every user is included in seat usage, with the following exceptions: ...@@ -81,7 +81,7 @@ Every user is included in seat usage, with the following exceptions:
- Members with the Guest role on an Ultimate subscription. - Members with the Guest role on an Ultimate subscription.
- GitLab-created service accounts: `Ghost User` and bots - GitLab-created service accounts: `Ghost User` and bots
([`Support Bot`](../../user/project/service_desk.md#support-bot-user), ([`Support Bot`](../../user/project/service_desk.md#support-bot-user),
[`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects), and
so on.) so on.)
Seat usage is reviewed [quarterly or annually](../quarterly_reconciliation.md). Seat usage is reviewed [quarterly or annually](../quarterly_reconciliation.md).
......
...@@ -67,7 +67,7 @@ billable user, with the following exceptions: ...@@ -67,7 +67,7 @@ billable user, with the following exceptions:
- Users without project or group memberships on an Ultimate subscription. - Users without project or group memberships on an Ultimate subscription.
- GitLab-created service accounts: `Ghost User` and bots - GitLab-created service accounts: `Ghost User` and bots
([`Support Bot`](../../user/project/service_desk.md#support-bot-user), ([`Support Bot`](../../user/project/service_desk.md#support-bot-user),
[`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects), and
so on.) so on.)
**Billable users** as reported in the `/admin` section is updated once per day. **Billable users** as reported in the `/admin` section is updated once per day.
......
...@@ -140,8 +140,8 @@ To enable or disable group access token creation for all sub-groups in a top-lev ...@@ -140,8 +140,8 @@ To enable or disable group access token creation for all sub-groups in a top-lev
Even when creation is disabled, you can still use and revoke existing group access tokens. Even when creation is disabled, you can still use and revoke existing group access tokens.
## Bot users ## Bot users for groups
Each time you create a group access token, a bot user is created and added to the group. Each time you create a group access token, a bot user is created and added to the group.
These bot users are similar to [project bot users](../../project/settings/project_access_tokens.md#project-bot-users), but are added to groups instead of projects. For more information, see These bot users are similar to [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects), but are added to groups instead of projects. For more information, see
[Project bot users](../../project/settings/project_access_tokens.md#project-bot-users). [Bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects).
...@@ -84,16 +84,16 @@ To enable or disable project access token creation for all projects in a top-lev ...@@ -84,16 +84,16 @@ To enable or disable project access token creation for all projects in a top-lev
Even when creation is disabled, you can still use and revoke existing project access tokens. Even when creation is disabled, you can still use and revoke existing project access tokens.
## Project bot users ## Bot users for projects
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/210181) in GitLab 13.0. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/210181) in GitLab 13.0.
> - [Excluded from license seat use](https://gitlab.com/gitlab-org/gitlab/-/issues/223695) in GitLab 13.5. > - [Excluded from license seat use](https://gitlab.com/gitlab-org/gitlab/-/issues/223695) in GitLab 13.5.
Project bot users are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#billable-users). Bot users for projects are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#billable-users).
Each time you create a project access token, a bot user is created and added to the project. Each time you create a project access token, a bot user is created and added to the project.
These bot users do not count as licensed seats. These bot users do not count as licensed seats.
The bot users have [permissions](../../permissions.md#project-members-permissions) that correspond with the The bot users for projects have [permissions](../../permissions.md#project-members-permissions) that correspond with the
selected role and [scope](#scopes-for-a-project-access-token) of the project access token. selected role and [scope](#scopes-for-a-project-access-token) of the project access token.
- The name is set to the name of the token. - The name is set to the name of the token.
...@@ -106,7 +106,7 @@ selected role and [scope](#scopes-for-a-project-access-token) of the project acc ...@@ -106,7 +106,7 @@ selected role and [scope](#scopes-for-a-project-access-token) of the project acc
API calls made with a project access token are associated with the corresponding bot user. API calls made with a project access token are associated with the corresponding bot user.
Bot users: Bot users for projects:
- Are included in a project's member list but cannot be modified. - Are included in a project's member list but cannot be modified.
- Cannot be added to any other project. - Cannot be added to any other project.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment