diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
commit | 1268cfeaf73a73c5593f13639530513716826e2b (patch) | |
tree | 2508ffb2fddaa666d99b4e5984d3340eb9194782 /doc/subscriptions | |
parent | be769d5fcced48143e92f83c997b7d5ba14873e1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/subscriptions')
-rw-r--r-- | doc/subscriptions/bronze_starter.md | 2 | ||||
-rw-r--r-- | doc/subscriptions/community_programs.md | 6 | ||||
-rw-r--r-- | doc/subscriptions/index.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md index b076987c0ae..b981a63a8b7 100644 --- a/doc/subscriptions/bronze_starter.md +++ b/doc/subscriptions/bronze_starter.md @@ -96,7 +96,7 @@ the tiers are no longer mentioned in GitLab documentation: - [Mirror with Perforce Helix with Git Fusion](../user/project/repository/mirror/bidirectional.md#mirror-with-perforce-helix-with-git-fusion) - Runners: - Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project) - - [Shared runners CI/CD minutes](../ci/pipelines/cicd_minutes.md) + - [Shared runners compute quota](../ci/pipelines/cicd_minutes.md) - [Push rules](../user/project/repository/push_rules.md) - SAML for self-managed GitLab instance: - [Administrator groups](../integration/saml.md#administrator-groups) diff --git a/doc/subscriptions/community_programs.md b/doc/subscriptions/community_programs.md index 36a5788a3fa..18a84ca9826 100644 --- a/doc/subscriptions/community_programs.md +++ b/doc/subscriptions/community_programs.md @@ -10,11 +10,11 @@ GitLab provides the following community program subscriptions. ## GitLab for Education -For qualifying non-profit educational institutions, the [GitLab for Education Program](https://about.gitlab.com/solutions/education/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. The subscription granted under GitLab for Education can only be used for instructional use or non-commercial academic research. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Education Program page](https://about.gitlab.com/solutions/education/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/education-program/). +For qualifying non-profit educational institutions, the [GitLab for Education Program](https://about.gitlab.com/solutions/education/) provides GitLab Ultimate, plus 50,000 units of compute per month. The subscription granted under GitLab for Education can only be used for instructional use or non-commercial academic research. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Education Program page](https://about.gitlab.com/solutions/education/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/education-program/). ## GitLab for Open Source -For qualifying open source projects, the [GitLab for Open Source Program](https://about.gitlab.com/solutions/open-source/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Open Source Program page](https://about.gitlab.com/solutions/open-source/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/opensource-program/). +For qualifying open source projects, the [GitLab for Open Source Program](https://about.gitlab.com/solutions/open-source/) provides GitLab Ultimate, plus 50,000 units of compute per month. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Open Source Program page](https://about.gitlab.com/solutions/open-source/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/opensource-program/). ### Meeting GitLab for Open Source Program requirements @@ -77,4 +77,4 @@ Exceptions to this public visibility requirement apply in select circumstances ( ## GitLab for Startups -For qualifying startups, the [GitLab for Startups](https://about.gitlab.com/solutions/startups/) program provides GitLab Ultimate, plus 50,000 CI/CD minutes per month for 12 months. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Startups Program page](https://about.gitlab.com/solutions/startups/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/startups-program/). +For qualifying startups, the [GitLab for Startups](https://about.gitlab.com/solutions/startups/) program provides GitLab Ultimate, plus 50,000 units of compute per month for 12 months. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Startups Program page](https://about.gitlab.com/solutions/startups/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/startups-program/). diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md index 9f329700c74..0b78704bb4d 100644 --- a/doc/subscriptions/index.md +++ b/doc/subscriptions/index.md @@ -18,5 +18,5 @@ Choose and manage the subscription that's right for you and your organization. - [Customers Portal](customers_portal.md) - [Quarterly reconciliation](quarterly_reconciliation.md) - [Storage usage quota](../user/usage_quotas.md) -- [CI/CD minutes quota](../ci/pipelines/cicd_minutes.md) +- [Compute quota](../ci/pipelines/cicd_minutes.md) - [Features available to Starter and Bronze subscribers](../subscriptions/bronze_starter.md) |