diff options
Diffstat (limited to 'doc/subscriptions/gitlab_com/index.md')
| -rw-r--r-- | doc/subscriptions/gitlab_com/index.md | 178 |
1 files changed, 75 insertions, 103 deletions
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md index aef1c1127c5..b7a1243be72 100644 --- a/doc/subscriptions/gitlab_com/index.md +++ b/doc/subscriptions/gitlab_com/index.md @@ -5,115 +5,83 @@ 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 - -On GitLab.com 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 - choosing a group plan when managing an organization's projects and users. -- A **personal userspace**, 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. - -## 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. Every occupied seat is counted in the subscription, with the following exception: -- Members with Guest permissions on a Gold subscription. +- Members with Guest permissions on an Ultimate subscription. NOTE: To support the open source community and encourage the development of open -source projects, GitLab grants access to **Gold** 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 - -To subscribe to GitLab.com: - -- **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**, **Silver**, or **Gold** GitLab.com plan through the - [Customers Portal](https://customers.gitlab.com/). - 1. Link your GitLab.com 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. - 1. Select the namespace from the drop-down list to associate the subscription. - 1. Proceed to checkout. -- **For groups**: - 1. Create a user account for yourself using our - [sign up page](https://gitlab.com/users/sign_up). - 1. Create a [group](../../user/group/index.md). GitLab groups help assemble related - projects together allowing you to grant members access to several projects - at once. A group is not required if you plan on having projects inside a personal - namespace. - 1. Create additional users and - [add them to the group](../../user/group/index.md#add-users-to-a-group). - 1. Select the **Bronze**, **Silver**, or **Gold** GitLab.com plan through the - [Customers Portal](https://customers.gitlab.com/). - 1. Link your GitLab.com 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. - 1. Select the namespace from the drop-down list to associate the subscription. - 1. Proceed to checkout. +## Obtain a GitLab SaaS subscription + +To subscribe to GitLab SaaS: + +1. Create a user account for yourself using our + [sign up page](https://gitlab.com/users/sign_up). +1. Create a [group](../../user/group/index.md). GitLab groups help assemble related + projects together allowing you to grant members access to several projects + at once. A group is not required if you plan on having projects inside a personal + namespace. +1. Create additional users and + [add them to the group](../../user/group/index.md#add-users-to-a-group). +1. Select the GitLab SaaS plan through the + [Customers Portal](https://customers.gitlab.com/). +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. +1. Select the namespace from the drop-down list to associate the subscription. +1. Proceed to checkout. 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. - -## View your GitLab.com subscription +page to add or change the GitLab SaaS account link. -To see the status of your GitLab.com subscription, log in to GitLab.com and go -to the **Billing** section of the relevant namespace: +## View your GitLab SaaS subscription -- **For individuals**: Visit the [billing page](https://gitlab.com/profile/billings) - under your profile. -- **For groups**: From the group page (*not* from a project in the group), go to **Settings > Billing**. +To see the status of your GitLab SaaS subscription, log in to GitLab SaaS and go +to the **Billing** section: - NOTE: - You must have Owner level [permissions](../../user/permissions.md) to view a group's billing page. +NOTE: +You must have Owner level [permissions](../../user/permissions.md) to view the billing page. - The following table describes details of your subscription for groups: +The following table describes details of your subscription: - | Field | Description | - |-----------------------------|-------------| - | **Seats in subscription** | If this is a paid plan, represents the number of seats you've bought for this group. | - | **Seats currently in use** | Number of seats in use. Select **See usage** to see a list of the users using these seats. For more details, see [Seat usage](#seat-usage). | - | **Max seats used** | Highest number of seats you've used. | - | **Seats owed** | _Seats owed_ = _Max seats used_ - _Seats in subscription_. | - | **Subscription start date** | Date your subscription started. If this is for a Free plan, it's the date you transitioned off your group's paid plan. | - | **Subscription end date** | Date your current subscription ends. Does not apply to Free plans. | +| Field | Description | +|:----------------------------|:------------| +| **Seats in subscription** | If this is a paid plan, represents the number of seats you've bought for this group. | +| **Seats currently in use** | Number of seats in use. Select **See usage** to see a list of the users using these seats. For more details, see [Seat usage](#seat-usage). | +| **Max seats used** | Highest number of seats you've used. | +| **Seats owed** | _Seats owed_ = _Max seats used_ - _Seats in subscription_. | +| **Subscription start date** | Date your subscription started. If this is for a Free plan, it's the date you transitioned off your group's paid plan. | +| **Subscription end date** | Date your current subscription ends. Does not apply to Free plans. | ## Seat usage @@ -125,7 +93,7 @@ The **Seat usage** page lists all users occupying seats. Details for each user i - Full name - Username -- Public email address (if they have provided one in their [profile settings](../../user/profile/index.md#profile-settings)) +- Public email address (if they have provided one in their [user settings](../../user/profile/index.md#user-settings)) The Seat usage listing is updated live, but the usage statistics on the billing page are updated only once per day. For this reason there can be a minor difference between the seat usage listing @@ -147,12 +115,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 +148,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 +203,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,13 +234,12 @@ 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 -- Silver: 10,000 minutes -- Gold: 50,000 minutes +- Premium: 10,000 minutes +- Ultimate: 50,000 minutes Quotas apply to: @@ -280,22 +247,25 @@ Quotas apply to: subgroups, and nested projects. To view the group's usage, navigate to the group, then **Settings > Usage Quotas**. - Your personal account, where the minutes are available for your personal projects. - To view and buy personal minutes, click your avatar, then - **Settings > [Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**. + To view and buy personal minutes: + + 1. In the top-right corner, select your avatar. + 1. Select **Edit profile**. + 1. In the left sidebar, select **[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 [Silver or Gold](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 +273,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**. @@ -315,10 +285,12 @@ To purchase additional minutes for your group on GitLab.com: To purchase additional minutes for your personal namespace: -1. Click your avatar, then go to **Settings > Usage Quotas**. +1. In the top-right corner, select your avatar. +1. Select **Edit profile**. +1. In the left sidebar, select **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. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Usage Quotas**. +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, go to the **Usage Quotas** settings again. The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month. @@ -348,7 +320,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 +333,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. |