diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /doc/subscriptions/self_managed/index.md | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'doc/subscriptions/self_managed/index.md')
-rw-r--r-- | doc/subscriptions/self_managed/index.md | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md index 5ac2c5a5037..cb9db3673ac 100644 --- a/doc/subscriptions/self_managed/index.md +++ b/doc/subscriptions/self_managed/index.md @@ -65,10 +65,12 @@ billable user, with the following exceptions: - Users who are [pending approval](../../user/admin_area/moderate_users.md#users-pending-approval). - Members with the Guest role on an Ultimate subscription. - Users without project or group memberships on an Ultimate subscription. -- GitLab-created service accounts: `Ghost User` and bots - ([`Support Bot`](../../user/project/service_desk.md#support-bot-user), - [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and - so on.) +- GitLab-created service accounts: + - [Ghost User](../../user/profile/account/delete_account.md#associated-records). + - Bots such as: + - [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. @@ -307,6 +309,11 @@ The **License Usage** CSV includes the following details: - Date the count was recorded - Active user count +NOTES: + +- All timestamps are displayed in UTC. +- A custom format is used for [dates](https://gitlab.com/gitlab-org/gitlab/blob/3be39f19ac3412c089be28553e6f91b681e5d739/config/initializers/date_time_formats.rb#L7) and [times](https://gitlab.com/gitlab-org/gitlab/blob/3be39f19ac3412c089be28553e6f91b681e5d739/config/initializers/date_time_formats.rb#L13) in CSV files. + ## Renew your subscription To renew your subscription, |