Commit ee93e6a2 authored by Nick Gaskill's avatar Nick Gaskill

Merge branch 'russell/rename-subscription-headings' into 'master'

Edited self-managed subscriptions headings and text for improved clarity

See merge request gitlab-org/gitlab!46200
parents 34fe2981 6b7a042c
......@@ -17,7 +17,7 @@ This integration works with most LDAP-compliant directory servers, including:
- Open LDAP
- 389 Server
Users added through LDAP take a [licensed seat](../../../subscriptions/self_managed/index.md#choose-the-number-of-users).
Users added through LDAP take a [licensed seat](../../../subscriptions/self_managed/index.md#billable-users).
GitLab Enterprise Editions (EE) include enhanced integration,
including group membership syncing as well as multiple LDAP servers support.
......
......@@ -9,16 +9,23 @@ type: index, reference
You can install, administer, and maintain your own GitLab instance.
In this page we'll go through the details of your GitLab self-managed subscription.
This page covers the details of your GitLab self-managed subscription.
## Choose a GitLab tier
## Subscription
The cost of a GitLab self-managed subscription is determined by the following:
- GitLab tier
- Subscription seats
## GitLab tier
Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choose
the features which fit your budget. For information on what features are available
at each tier, see the
[GitLab self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/).
## Choose the number of users
## Subscription seats
A self-managed subscription uses a hybrid model. You pay for a subscription
according to the maximum number of users enabled during the subscription period.
......@@ -26,14 +33,17 @@ For instances that aren't offline or on a closed network, the maximum number of
simultaneous users in the self-managed installation is checked each quarter,
using [Seat Link](#seat-link).
Every occupied seat is counted in the subscription, with the following exceptions:
### Billable users
A _billable user_ counts against the number of subscription seats. Every user is considered a
billable user, with the following exceptions:
- [Deactivated](../../user/admin_area/activating_deactivating_users.md#deactivating-a-user), [pending approval](../../user/admin_area/approving_users.md) 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.
- [Deactivated users](../../user/admin_area/activating_deactivating_users.md#deactivating-a-user) and
[blocked users](../../user/admin_area/blocking_unblocking_users.md) don't count as billable users in the current subscription. When they are either deactivated or blocked they release a _billable user_ seat. However, they may
count toward overages in the subscribed seat count.
- Users who are [pending approval](../../user/admin_area/approving_users.md).
- Members with Guest permissions on an Ultimate subscription.
- GitLab-created service accounts: `Ghost User` and bots (`Support Bot`, [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), etc.).
- GitLab-created service accounts: `Ghost User` and bots (`Support Bot`, [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and so on).
### Users statistics
......@@ -99,10 +109,10 @@ It's important to regularly review your user accounts, because:
#### Users over License
A GitLab subscription is valid for a specific number of users. For details, see
[Choose the number of users](#choose-the-number-of-users). If the active user
[Billable users](#billable-users). If the billable user
count exceeds the number included in the subscription, known as the number of
_users over license_, you must pay for the excess number of users either before
renewal, or at the time of renewal. This is also known the _true up_ process.
renewal, or at the time of renewal. This is also known as the _true up_ process.
Self-managed instances can add users to a subscription any time during the
subscription period. The cost of additional users added during the subscription
......
......@@ -44,7 +44,7 @@ Please note that for the deactivation option to be visible to an admin, the user
Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
NOTE: **Note:**
A deactivated user does not consume a [seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
A deactivated user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
## Activating a user
......@@ -62,8 +62,8 @@ To do this:
Users can also be activated using the [GitLab API](../../api/users.md#activate-user).
NOTE: **Note:**
Activating a user will change the user's state to active and it consumes a
[seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
Activating a user changes the user's state to active and consumes a
[seat](../../subscriptions/self_managed/index.md#billable-users).
TIP: **Tip:**
A deactivated user can also activate their account themselves by simply logging back in via the UI.
......@@ -18,7 +18,7 @@ A user pending approval:
- Will not be able to sign in.
- Cannot access Git repositories or the API.
- Will not receive any notifications from GitLab.
- Does not consume a [seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
- Does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
## Approving a user
......@@ -33,4 +33,4 @@ Approving a user:
1. Activates their account.
1. Changes the user's state to active and it consumes a
[seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
[seat](../../subscriptions/self_managed/index.md#billable-users).
......@@ -23,17 +23,17 @@ or directly from the Admin Area. To do this:
A blocked user:
- Will not be able to login.
- Cannot log in.
- Cannot access Git repositories or the API.
- Will not receive any notifications from GitLab.
- Will not be able to use [slash commands](../../integration/slash_commands.md).
- Does not receive any notifications from GitLab.
- Cannot use [slash commands](../../integration/slash_commands.md).
Personal projects, and group and user history of the blocked user will be left intact.
Personal projects, and group and user history of the blocked user are left intact.
Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
NOTE: **Note:**
A blocked user does not consume a [seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
A blocked user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
## Unblocking a user
......@@ -47,5 +47,5 @@ A blocked user can be unblocked from the Admin Area. To do this:
Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user).
NOTE: **Note:**
Unblocking a user will change the user's state to active and it consumes a
[seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
Unblocking a user changes the user's state to active and consumes a
[seat](../../subscriptions/self_managed/index.md#billable-users).
......@@ -146,22 +146,16 @@ you must provide the complete email address.
#### Users statistics
The **Users statistics** page provides an overview of user accounts by role, such as _Users with
highest role Maintainer_.
The **Users statistics** page provides an overview of user accounts by role. These statistics are
calculated daily, so user changes made since the last update are not reflected.
The following totals are also included:
- Active users
- Billable users
- Blocked users
- Total users
GitLab billing is based on the number of **Active users**, calculated as **Total users** -
**Blocked users**. For details of active users, see
[Choosing the number of users](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
NOTE: **Note:**
Users statistics are calculated daily, so user changes made since the last update won't be
reflected in the statistics.
GitLab billing is based on the number of [**Billable users**](../../subscriptions/self_managed/index.md#billable-users).
### Administering Groups
......
......@@ -54,7 +54,7 @@ Furthermore, the bot user can not be added to any other project.
When the project access token is [revoked](#revoking-a-project-access-token) the bot user is then deleted and all records are moved to a system-wide user with the username "Ghost User". For more information, see [Associated Records](../../profile/account/delete_account.md#associated-records).
Project bot users are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#choose-the-number-of-users) and do not count as licensed seats.
Project bot users are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#billable-users) and do not count as licensed seats.
## Revoking a project access token
......
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