Commit 79a55663 authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'eread/bot-users-group-seat-clarification' into 'master'

Clarify that Bot users for groups don't use a licensed seat

See merge request gitlab-org/gitlab!79082
parents bb4e5bea 20f451ad
...@@ -533,7 +533,7 @@ Parameters: ...@@ -533,7 +533,7 @@ Parameters:
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|---------------|---------|----------|----------------------------------------------| |---------------|---------|----------|----------------------------------------------|
| `id` | integer | yes | The ID of a user | | `id` | integer | yes | The ID of a user |
| `hard_delete` | boolean | no | If true, contributions that would usually be [moved to the ghost user](../user/profile/account/delete_account.md#associated-records) are deleted instead, as well as groups owned solely by this user. | | `hard_delete` | boolean | no | If true, contributions that would usually be [moved to Ghost User](../user/profile/account/delete_account.md#associated-records) are deleted instead, as well as groups owned solely by this user. |
## List current user (for normal users) ## List current user (for normal users)
......
...@@ -79,10 +79,12 @@ Every user is included in seat usage, with the following exceptions: ...@@ -79,10 +79,12 @@ Every user is included in seat usage, with the following exceptions:
- Users who are pending approval. - Users who are pending approval.
- 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:
([`Support Bot`](../../user/project/service_desk.md#support-bot-user), - [Ghost User](../../user/profile/account/delete_account.md#associated-records).
[Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects), and - Bots such as:
so on.) - [Support Bot](../../user/project/service_desk.md#support-bot-user).
- [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects).
- [Bot users for groups](../../user/group/settings/group_access_tokens.md#bot-users-for-groups).
Seat usage is reviewed [quarterly or annually](../quarterly_reconciliation.md). Seat usage is reviewed [quarterly or annually](../quarterly_reconciliation.md).
......
...@@ -65,10 +65,12 @@ billable user, with the following exceptions: ...@@ -65,10 +65,12 @@ billable user, with the following exceptions:
- Users who are [pending approval](../../user/admin_area/moderate_users.md#users-pending-approval). - Users who are [pending approval](../../user/admin_area/moderate_users.md#users-pending-approval).
- Members with the Guest role on an Ultimate subscription. - Members with the Guest role on an Ultimate subscription.
- 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:
([`Support Bot`](../../user/project/service_desk.md#support-bot-user), - [Ghost User](../../user/profile/account/delete_account.md#associated-records).
[Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects), and - Bots such as:
so on.) - [Support Bot](../../user/project/service_desk.md#support-bot-user).
- [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects).
- [Bot users for groups](../../user/group/settings/group_access_tokens.md#bot-users-for-groups).
**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.
......
...@@ -143,5 +143,8 @@ Even when creation is disabled, you can still use and revoke existing group acce ...@@ -143,5 +143,8 @@ Even when creation is disabled, you can still use and revoke existing group acce
## Bot users for groups ## 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 [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 These bot users are similar to [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects),
[Bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects). except they are added to groups instead of projects.
These bot users do not count as licensed seats.
For more information, see [Bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects).
...@@ -65,7 +65,7 @@ Here's a list of things created by the user that are **not** deleted: ...@@ -65,7 +65,7 @@ Here's a list of things created by the user that are **not** deleted:
- Notes - Notes
Instead of being deleted, these records are moved to a system-wide Instead of being deleted, these records are moved to a system-wide
user with the username "Ghost User", whose sole purpose is to act as a container user with the username Ghost User, whose sole purpose is to act as a container
for such records. Any commits made by a deleted user still display the for such records. Any commits made by a deleted user still display the
username of the original user. username of the original user.
......
...@@ -114,5 +114,6 @@ Bot users for projects: ...@@ -114,5 +114,6 @@ Bot users for projects:
When the project access token is [revoked](#revoke-a-project-access-token): When the project access token is [revoked](#revoke-a-project-access-token):
- The bot user is deleted. - The bot user is deleted.
- All records are moved to a system-wide user with the username `Ghost User`. For more information, see - All records are moved to a system-wide user with the username [Ghost User](../../profile/account/delete_account.md#associated-records).
[associated records](../../profile/account/delete_account.md#associated-records).
See also [Bot users for groups](../../group/settings/group_access_tokens.md#bot-users-for-groups).
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