Skip to content

G
gitlab-ce
Commit a8c61b1e authored by Evan Read's avatar Evan Read
Browse files
Options

Merge branch 'russell/update-plan-references-for-fulfillment' into 'master' 

Update plan references for Fulfillment

See merge request gitlab-org/gitlab!52635
parents 3cce9517 09639ebc
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 69 deletions
doc/subscriptions/gitlab_com/index.md
View file @ a8c61b1e
......@@ -5,41 +5,41 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: index, reference
---
# GitLab.com subscription **(BRONZE ONLY)**
# GitLab SaaS subscription **(PREMIUM SAAS)**
GitLab.com is GitLab Inc.'s software-as-a-service offering. You don't need to
install anything to use GitLab.com, you only need to
GitLab SaaS is GitLab Inc.'s software-as-a-service offering. You don't need to
install anything to use GitLab SaaS, you only need to
[sign up](https://gitlab.com/users/sign_up) and start using GitLab straight away.
This page reviews the details of your GitLab.com subscription.
This page reviews the details of your GitLab SaaS subscription.
## Choose a GitLab.com group or personal subscription
## Choose a GitLab SaaS group or personal subscription
On GitLab.com you can apply a subscription to either a group or a personal namespace.
On GitLab SaaS you can apply a subscription to either a group or a personal namespace.
When applied to:
- A **group**, the group, all subgroups, and all projects under the selected
group on GitLab.com contains the features of the associated tier. GitLab recommends
group on GitLab SaaS contains the features of the associated tier. GitLab recommends
choosing a group plan when managing an organization's projects and users.
- A **personal user space**, all projects contain features with the
subscription applied, but as it's not a group, group features aren't available.
You can read more about [common misconceptions](https://about.gitlab.com/handbook/marketing/strategic-marketing/enablement/dotcom-subscriptions/#common-misconceptions) regarding a GitLab.com subscription to help avoid issues.
You can read more about [common misconceptions](https://about.gitlab.com/handbook/marketing/strategic-marketing/enablement/dotcom-subscriptions/#common-misconceptions) regarding a GitLab SaaS subscription to help avoid issues.
## Choose a GitLab.com tier
## Choose a GitLab SaaS 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.com feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/).
[GitLab SaaS feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/).
## Choose the number of users
NOTE:
Applied only to groups.
A GitLab.com subscription uses a concurrent (_seat_) model. You pay for a
A GitLab SaaS subscription uses a concurrent (_seat_) model. You pay for a
subscription according to the maximum number of users enabled at once. You can
add and remove users during the subscription period, as long as the total users
at any given time doesn't exceed the subscription count.
......@@ -50,21 +50,21 @@ Every occupied seat is counted in the subscription, with the following exception
NOTE:
To support the open source community and encourage the development of open
source projects, GitLab grants access to **Ultimate** features for all GitLab.com
source projects, GitLab grants access to **Ultimate** features for all GitLab SaaS
**public** projects, regardless of the subscription.
## Obtain a GitLab.com subscription
## Obtain a GitLab SaaS subscription
To subscribe to GitLab.com:
To subscribe to GitLab SaaS:
- **For individuals**:
1. Create a user account for yourself using our
[sign up page](https://gitlab.com/users/sign_up).
1. Visit the [billing page](https://gitlab.com/profile/billings)
under your profile.
1. Select the **Bronze**, **Premium**, or **Ultimate** GitLab.com plan through the
1. Select the **Premium** or **Ultimate** GitLab SaaS plan through the
[Customers Portal](https://customers.gitlab.com/).
1. Link your GitLab.com account with your Customers Portal account.
1. Link your GitLab SaaS account with your Customers Portal account.
Once a plan has been selected, if your account is not
already linked, GitLab prompts you to link your account with a
**Sign in to GitLab.com** button.
......@@ -79,9 +79,9 @@ To subscribe to GitLab.com:
namespace.
1. Create additional users and
[add them to the group](../../user/group/index.md#add-users-to-a-group).
1. Select the **Bronze**, **Premium**, or **Ultimate** GitLab.com plan through the
1. Select the GitLab SaaS plan through the
[Customers Portal](https://customers.gitlab.com/).
1. Link your GitLab.com account with your Customers Portal account.
1. Link your GitLab SaaS account with your Customers Portal account.
Once a plan has been selected, if your account is not
already linked, GitLab prompts you to link your account with a
**Sign in to GitLab.com** button.
......@@ -90,11 +90,11 @@ To subscribe to GitLab.com:
NOTE:
You can also go to the [**My Account**](https://customers.gitlab.com/customers/edit)
page to add or change the GitLab.com account link.
page to add or change the GitLab SaaS account link.
## View your GitLab.com subscription
## View your GitLab SaaS subscription
To see the status of your GitLab.com subscription, log in to GitLab.com and go
To see the status of your GitLab SaaS subscription, log in to GitLab SaaS and go
to the **Billing** section of the relevant namespace:
- **For individuals**: Visit the [billing page](https://gitlab.com/profile/billings)
......@@ -147,12 +147,12 @@ For example:
| Amir | `ami` | Yes |
| Amir | `amr` | No |
## Renew your GitLab.com subscription
## Renew your GitLab SaaS subscription
To renew your subscription:
1. [Prepare for renewal by reviewing your account](#prepare-for-renewal-by-reviewing-your-account)
1. [Renew your GitLab.com subscription](#renew-or-change-a-gitlabcom-subscription)
1. [Prepare for renewal by reviewing your account.](#prepare-for-renewal-by-reviewing-your-account)
1. [Renew your GitLab SaaS subscription.](#renew-or-change-a-gitlab-saas-subscription)
### Prepare for renewal by reviewing your account
......@@ -180,21 +180,21 @@ It's important to regularly review your user accounts, because:
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 number of [billable users](#view-your-gitlabcom-subscription) exceeds the number included in the subscription, known
If the number of [billable users](#view-your-gitlab-saas-subscription) 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.
### Renew or change a GitLab.com subscription
### Renew or change a GitLab SaaS subscription
You can adjust the number of users before renewing your GitLab.com subscription.
You can adjust the number of users before renewing your GitLab SaaS subscription.
- To renew for more users than are currently included in your GitLab.com plan, [add users to your subscription](#add-users-to-your-subscription).
- To renew for fewer users than are currently included in your GitLab.com plan,
- To renew for more users than are currently included in your GitLab SaaS plan, [add users to your subscription](#add-users-to-your-subscription).
- To renew for fewer users than are currently included in your GitLab SaaS plan,
either [disable](../../user/admin_area/activating_deactivating_users.md#deactivating-a-user) or [block](../../user/admin_area/blocking_unblocking_users.md#blocking-a-user) the user accounts you no longer need.
For details on upgrading your subscription tier, see
[Upgrade your GitLab.com subscription tier](#upgrade-your-gitlabcom-subscription-tier).
[Upgrade your GitLab SaaS subscription tier](#upgrade-your-gitlab-saas-subscription-tier).
#### Automatic renewal
......@@ -235,7 +235,7 @@ The following is emailed to you:
- A payment receipt. You can also access this information in the Customers Portal under
[**View invoices**](https://customers.gitlab.com/receipts).
## Upgrade your GitLab.com subscription tier
## Upgrade your GitLab SaaS subscription tier
To upgrade your [GitLab tier](https://about.gitlab.com/pricing/):
......@@ -266,11 +266,10 @@ If you renew or upgrade, your data is accessible again.
CI pipeline minutes are the execution time for your
[pipelines](../../ci/pipelines/index.md) on GitLab shared runners. Each
[GitLab.com tier](https://about.gitlab.com/pricing/) includes a monthly quota
[GitLab SaaS tier](https://about.gitlab.com/pricing/) includes a monthly quota
of CI pipeline minutes:
- Free: 400 minutes
- Bronze: 2,000 minutes
- Premium: 10,000 minutes
- Ultimate: 50,000 minutes
......@@ -284,18 +283,18 @@ Quotas apply to:
**Settings > [Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
Only pipeline minutes for GitLab shared runners are restricted. If you have a
specific runner set up for your projects, there is no limit to your build time on GitLab.com.
specific runner set up for your projects, there is no limit to your build time on GitLab SaaS.
The available quota is reset on the first of each calendar month at midnight UTC.
When the CI minutes are depleted, an email is sent automatically to notify the owner(s)
of the namespace. You can [purchase additional CI minutes](#purchase-additional-ci-minutes),
or upgrade your account to [Premium or Ultimate](https://about.gitlab.com/pricing/).
or upgrade your account to a higher [plan](https://about.gitlab.com/pricing/).
Your own runners can still be used even if you reach your limits.
### Purchase additional CI minutes
If you're using GitLab.com, you can purchase additional CI minutes so your
If you're using GitLab SaaS, you can purchase additional CI minutes so your
pipelines aren't blocked after you have used all your CI minutes from your
main quota. You can find pricing for additional CI/CD minutes in the
[GitLab Customers Portal](https://customers.gitlab.com/plans). Additional minutes:
......@@ -303,11 +302,11 @@ main quota. You can find pricing for additional CI/CD minutes in the
- Are only used after the shared quota included in your subscription runs out.
- Roll over month to month.
To purchase additional minutes for your group on GitLab.com:
To purchase additional minutes for your group on GitLab SaaS:
1. From your group, go to **Settings > Usage Quotas**.
1. Select **Buy additional minutes** and GitLab directs you to the Customers Portal.
1. Locate the subscription card that's linked to your group on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction.
1. Locate the subscription card that's linked to your group on GitLab SaaS, click **Buy more CI minutes**, and complete the details about the transaction.
1. Once we have processed your payment, the extra CI minutes are synced to your group namespace.
1. To confirm the available CI minutes, go to your group, then **Settings > Usage Quotas**.
......@@ -317,7 +316,7 @@ To purchase additional minutes for your personal namespace:
1. Click your avatar, then go to **Settings > Usage Quotas**.
1. Select **Buy additional minutes** and GitLab redirects you to the Customers Portal.
1. Locate the subscription card that's linked to your personal namespace on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes are synced to your personal namespace.
1. Locate the subscription card that's linked to your personal namespace on GitLab SaaS, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes are synced to your personal namespace.
1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Usage Quotas**.
The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month.
......@@ -348,7 +347,7 @@ locked. Projects can only be unlocked by purchasing more storage subscription un
To purchase more storage for either a personal or group namespace:
1. Sign in to GitLab.com.
1. Sign in to GitLab SaaS.
1. From either your personal homepage or the group's page, go to **Settings > Usage Quotas**.
1. For each locked project, total by how much its **Usage** exceeds the free quota and purchased
storage. You must purchase the storage increment that exceeds this total.
......@@ -361,7 +360,7 @@ To purchase more storage for either a personal or group namespace:
1. Select the **Privacy Policy** and **Terms of Service** checkbox.
1. Select **Buy subscription**.
1. Sign out of the Customers Portal.
1. Switch back to the GitLab.com tab and refresh the page.
1. Switch back to the GitLab SaaS tab and refresh the page.
The **Purchased storage available** total is incremented by the amount purchased. All locked
projects are unlocked and their excess usage is deducted from the additional storage.
......
doc/subscriptions/index.md
View file @ a8c61b1e
......@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: index, reference
---
# GitLab subscription **(STARTER)**
# GitLab subscription **(PREMIUM)**
GitLab offers tiers of features. Your subscription determines which tier you
have access to. Subscriptions are valid for 12 months.
......@@ -19,26 +19,26 @@ GitLab provides special subscriptions to participants in:
When choosing a subscription, there are two factors to consider:
- [GitLab.com or self-managed](#choose-between-gitlabcom-or-self-managed)
- [GitLab SaaS or GitLab self-managed](#choose-between-gitlab-saas-or-gitlab-self-managed)
- [GitLab tier](#choose-a-gitlab-tier)
### Choose between GitLab.com or self-managed
### Choose between GitLab SaaS or GitLab self-managed
There are some differences in how a subscription applies, depending if you use
GitLab.com or a self-managed instance:
GitLab SaaS or GitLab self-managed:
- [GitLab.com](gitlab_com/index.md): The GitLab software-as-a-service offering.
You don't need to install anything to use GitLab.com, you only need to
- [GitLab SaaS](gitlab_com/index.md): The GitLab software-as-a-service offering.
You don't need to install anything to use GitLab SaaS, you only need to
[sign up](https://gitlab.com/users/sign_up) and start using GitLab straight away.
- [GitLab self-managed](self_managed/index.md): Install, administer, and maintain
your own GitLab instance.
On a self-managed instance, a GitLab subscription provides the same set of
features for _all_ users. On GitLab.com, you can apply a subscription to either
On a GitLab self-managed instance, a GitLab subscription provides the same set of
features for _all_ users. On GitLab SaaS, you can apply a subscription to either
a group or a personal namespace.
NOTE:
Subscriptions cannot be transferred between GitLab.com and GitLab self-managed.
Subscriptions cannot be transferred between GitLab SaaS and GitLab self-managed.
A new subscription must be purchased and applied as needed.
### Choose a GitLab tier
......@@ -47,8 +47,8 @@ Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choo
the features which fit your budget. For information on what features are available
at each tier for each product, see:
- [GitLab.com feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/)
- [Self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/)
- [GitLab SaaS feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/)
- [GitLab self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/)
## Find your subscription
......@@ -134,11 +134,11 @@ To change the GitLab.com account linked to your Customers Portal account:
1. Log in to the
[Customers Portal](https://customers.gitlab.com/customers/sign_in).
1. In a separate browser tab, go to [GitLab.com](https://gitlab.com) and ensure you
1. In a separate browser tab, go to [GitLab SaaS](https://gitlab.com) and ensure you
are not logged in.
1. On the Customers Portal page, click **My account > Account details**.
1. Under **Your GitLab.com account**, click **Change linked account**.
1. Log in to the [GitLab.com](https://gitlab.com) account you want to link to the Customers Portal
1. Log in to the [GitLab SaaS](https://gitlab.com) account you want to link to the Customers Portal
account.
### Change the linked namespace
......@@ -146,7 +146,7 @@ To change the GitLab.com account linked to your Customers Portal account:
To change the namespace linked to a subscription:
1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) with a
[linked](#change-the-linked-account) GitLab.com account.
[linked](#change-the-linked-account) GitLab SaaS account.
1. Navigate to the **Manage Purchases** page.
1. Select **Change linked namespace**.
1. Select the desired group from the **This subscription is for** dropdown.
......
doc/subscriptions/self_managed/index.md
View file @ a8c61b1e
......@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: index, reference
---
# GitLab self-managed subscription **(STARTER ONLY)**
# GitLab self-managed subscription **(PREMIUM SELF)**
You can install, administer, and maintain your own GitLab instance.
......@@ -37,10 +37,10 @@ at each tier, see the
## Subscription seats
A self-managed subscription uses a hybrid model. You pay for a subscription
A GitLab self-managed subscription uses a hybrid model. You pay for a subscription
according to the maximum number of users enabled during the subscription period.
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,
simultaneous users in the GitLab self-managed installation is checked each quarter,
using [Seat Link](#seat-link).
### Billable users
......@@ -76,15 +76,14 @@ GitLab has several features which can help you manage the number of users:
## Obtain a subscription
To subscribe to GitLab through a self-managed installation:
To subscribe to GitLab through a GitLab self-managed installation:
1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a
**Starter**, **Premium**, or **Ultimate** self-managed plan.
1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a GitLab self-managed plan.
1. After purchase, a license file is sent to the email address associated to the Customers Portal account,
which must be [uploaded to your GitLab instance](../../user/admin_area/license.md#uploading-your-license).
NOTE:
If you're purchasing a subscription for an existing **Core** self-managed
If you're purchasing a subscription for an existing **Free** GitLab self-managed
instance, ensure you're purchasing enough seats to
[cover your users](../../user/admin_area/index.md#administering-users).
......@@ -114,7 +113,7 @@ It also displays the following important statistics:
To renew your subscription,
[prepare for renewal by reviewing your account](#prepare-for-renewal-by-reviewing-your-account),
then [renew your self-managed subscription](#renew-a-subscription).
then [renew your GitLab self-managed subscription](#renew-a-subscription).
### Prepare for renewal by reviewing your account
......@@ -203,9 +202,9 @@ An invoice is generated for the renewal and available for viewing or download on
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208832) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.9.
Seat Link allows GitLab Inc. to provide our self-managed customers with prorated charges for user growth throughout the year using a quarterly reconciliation process.
Seat Link allows GitLab Inc. to provide our GitLab self-managed customers with prorated charges for user growth throughout the year using a quarterly reconciliation process.
Seat Link daily sends a count of all users in connected self-managed instances to GitLab. That information is used to automate prorated reconciliations. The data is sent securely through an encrypted HTTPS connection to `customers.gitlab.com` on port `443`.
Seat Link daily sends a count of all users in connected GitLab self-managed instances to GitLab. That information is used to automate prorated reconciliations. The data is sent securely through an encrypted HTTPS connection to `customers.gitlab.com` on port `443`.
Seat Link provides **only** the following information to GitLab:
......@@ -325,7 +324,7 @@ behave as expected if you're not prepared for the expiry. For example,
[environment specific variables not being passed](https://gitlab.com/gitlab-org/gitlab/-/issues/24759).
If you renew or upgrade, your data is again accessible.
For self-managed customers, there is a 14-day grace period when your features
For GitLab self-managed customers, there is a 14-day grace period when your features
continue to work as-is, after which the entire instance becomes read
only.
......
doc/user/usage_quotas.md
View file @ a8c61b1e
......@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Storage usage quota
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13294) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.0.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/13294) in GitLab 12.0.
> - Moved to GitLab Free.
A project's repository has a free storage quota of 10 GB. When a project's repository reaches
......@@ -32,11 +32,11 @@ namespace to trigger a recalculation.
A stacked bar graph shows the proportional storage used for the namespace, including a total per
storage item. Click on each project's title to see a breakdown per storage item.
## Storage usage statistics **(BRONZE ONLY)**
## Storage usage statistics
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247831) in GitLab 13.7.
> - It's [deployed behind a feature flag](../user/feature_flags.md), enabled by default.
> - It's enabled on GitLab.com.
> - It's enabled on GitLab SaaS.
> - It's recommended for production use.
WARNING:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7