diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 15:08:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 15:08:00 +0300 |
| commit | 1a0d6dbdc2ac3047f4953a359ef27ba6e26074ae (patch) | |
| tree | ddb78a8a0d1350dc767f049a21e0f7d37edaa82c /doc/subscriptions | |
| parent | b11f7057d067885619ee3e513751f180b2e8ad85 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/subscriptions')
| -rw-r--r-- | doc/subscriptions/index.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md index e3dd46af6bf..1c8ecec139d 100644 --- a/doc/subscriptions/index.md +++ b/doc/subscriptions/index.md @@ -68,7 +68,10 @@ A self-managed subscription uses a hybrid model. You pay for a subscription acco Every occupied seat, whether by person, job, or bot is counted in the subscription, with the following exceptions: -- Blocked users who are blocked prior to the renewal of a subscription won't be counted as active users for the renewal subscription. They may count as active users in the subscription period in which they were originally added. +- [Deactivated](../user/admin_area/activating_deactivating_users.md#deactivating-a-user) and +[blocked](../user/admin_area/blocking_unblocking_users.md) users who are restricted prior to the +renewal of a subscription won't be counted as active users for the renewal subscription. They may +count as active users in the subscription period in which they were originally added. - Members with Guest permissions on an Ultimate subscription. - GitLab-created service accounts: `Ghost User` and `Support Bot`. |