Commit 9ebc3d4c authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'docs/31942-document-subscription-true-up-process' into 'master'

Initial changes for GitLab subscriptions

See merge request gitlab-org/gitlab!21224
parents d5ceeeb2 28a87757
This diff is collapsed.
...@@ -41,7 +41,7 @@ Please note that for the deactivation option to be visible to an admin, the user ...@@ -41,7 +41,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). Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
NOTE: **Note:** NOTE: **Note:**
A deactivated user does not consume a [seat](../../subscriptions/index.md#managing-subscriptions). A deactivated user does not consume a [seat](../../subscriptions/index.md#choosing-the-number-of-users).
## Activating a user ## Activating a user
...@@ -60,7 +60,7 @@ Users can also be activated using the [GitLab API](../../api/users.md#activate-u ...@@ -60,7 +60,7 @@ Users can also be activated using the [GitLab API](../../api/users.md#activate-u
NOTE: **Note:** NOTE: **Note:**
Activating a user will change the user's state to active and it consumes a Activating a user will change the user's state to active and it consumes a
[seat](../../subscriptions/index.md#managing-subscriptions). [seat](../../subscriptions/index.md#choosing-the-number-of-users).
TIP: **Tip:** TIP: **Tip:**
A deactivated user can also activate their account by themselves by simply logging back via the UI. A deactivated user can also activate their account by themselves by simply logging back via the UI.
...@@ -30,7 +30,7 @@ Personal projects, and group and user history of the blocked user will be left i ...@@ -30,7 +30,7 @@ Personal projects, and group and user history of the blocked user will be left i
Users can also be blocked using the [GitLab API](../../api/users.md#block-user). Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
NOTE: **Note:** NOTE: **Note:**
A blocked user does not consume a [seat](../../subscriptions/index.md#managing-subscriptions). A blocked user does not consume a [seat](../../subscriptions/index.md#choosing-the-number-of-users).
## Unblocking a user ## Unblocking a user
...@@ -45,4 +45,4 @@ Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-us ...@@ -45,4 +45,4 @@ Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-us
NOTE: **Note:** NOTE: **Note:**
Unblocking a user will change the user's state to active and it consumes a Unblocking a user will change the user's state to active and it consumes a
[seat](../../subscriptions/index.md#managing-subscriptions). [seat](../../subscriptions/index.md#choosing-the-number-of-users).
...@@ -117,7 +117,7 @@ service included with GitLab that coordinates the jobs. ...@@ -117,7 +117,7 @@ service included with GitLab that coordinates the jobs.
If the project is on GitLab.com, shared Runners are available If the project is on GitLab.com, shared Runners are available
(the first 2000 minutes are free, you can (the first 2000 minutes are free, you can
[buy more later](../../subscriptions/index.md#extra-shared-runners-pipeline-minutes)) [buy more later](../../subscriptions/index.md#purchasing-additional-ci-minutes))
and you do not have to deploy one if they are enough for your needs. If a and you do not have to deploy one if they are enough for your needs. If a
project-specific Runner is desired, or there are no shared Runners, it is easy project-specific Runner is desired, or there are no shared Runners, it is easy
to deploy one. to deploy one.
......
...@@ -104,7 +104,7 @@ Linux Shared Runners on GitLab.com run in [autoscale mode] and are powered by Go ...@@ -104,7 +104,7 @@ Linux Shared Runners on GitLab.com run in [autoscale mode] and are powered by Go
Autoscaling means reduced waiting times to spin up CI/CD jobs, and isolated VMs for each project, Autoscaling means reduced waiting times to spin up CI/CD jobs, and isolated VMs for each project,
thus maximizing security. They're free to use for public open source projects and limited thus maximizing security. They're free to use for public open source projects and limited
to 2000 CI minutes per month per group for private projects. More minutes to 2000 CI minutes per month per group for private projects. More minutes
[can be purchased](../../subscriptions/index.md#extra-shared-runners-pipeline-minutes), if [can be purchased](../../subscriptions/index.md#purchasing-additional-ci-minutes), if
needed. Read about all [GitLab.com plans](https://about.gitlab.com/pricing/). needed. Read about all [GitLab.com plans](https://about.gitlab.com/pricing/).
All your CI/CD jobs run on [n1-standard-1 instances](https://cloud.google.com/compute/docs/machine-types) with 3.75GB of RAM, CoreOS and the latest Docker Engine All your CI/CD jobs run on [n1-standard-1 instances](https://cloud.google.com/compute/docs/machine-types) with 3.75GB of RAM, CoreOS and the latest Docker Engine
......
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