diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-06-26 11:28:17 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-06-26 11:28:17 +0000 |
| commit | d525c7b0275d2f8392f3646741654b29ff3cbb8a (patch) | |
| tree | 513ffd6f8fa9e71700aea087b3ee57876404b90d | |
| parent | 5450976d289a2887688ef938fb86e8f0e5924892 (diff) | |
| parent | fbcfdc69c70a6bd56a221c3a8bebb9f3fdbceb5f (diff) | |
| download | gitlab-ce-d525c7b0275d2f8392f3646741654b29ff3cbb8a.tar.gz | |
Merge branch '61687-follow-up-from-update-ci-minutes-docs-to-reflect-this-is-available-to-all-plans-docs' into 'master'
Add missing tier badge for the pipelines quota
Closes #61687
See merge request gitlab-org/gitlab-ce!30046
| -rw-r--r-- | doc/ci/README.md | 2 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/ci/README.md b/doc/ci/README.md index 1743c38eb46..da864a0b3cc 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -63,7 +63,7 @@ Once you're familiar with how GitLab CI/CD works, see the for all the attributes you can set and use. NOTE: **Note:** -GitLab CI/CD and [shared runners](runners/README.md#shared-specific-and-group-runners) are enabled in GitLab.com and available for all users, limited only to the [user's pipelines quota](../user/admin_area/settings/continuous_integration.md#extra-shared-runners-pipeline-minutes-quota). +GitLab CI/CD and [shared runners](runners/README.md#shared-specific-and-group-runners) are enabled in GitLab.com and available for all users, limited only to the [user's pipelines quota](../user/admin_area/settings/continuous_integration.md#extra-shared-runners-pipeline-minutes-quota-free-only). ## Configuration diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 5768a97e727..84596ff6a2c 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -94,13 +94,11 @@ a group in the **Usage Quotas** page available to the group page settings list.  -## Extra Shared Runners pipeline minutes quota +## Extra Shared Runners pipeline minutes quota **[FREE ONLY]** -NOTE: **Note:** -Only available on GitLab.com. - -You can purchase additional CI minutes so your pipelines will not be blocked after you have -used all your CI minutes from your main quota. +If you're using GitLab.com, you can purchase additional CI minutes so your +pipelines will not be blocked after you have used all your CI minutes from your +main quota. In order to purchase additional minutes, you should follow these steps: |