diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-17 03:38:43 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-20 13:20:38 +0000 |
commit | b0d0c808f5e887391fb5554ac64ed7fd8e3c5ec2 (patch) | |
tree | 995a660c56db8a11b47e7bd6f4eb9f2c472f4e43 | |
parent | 5c133d940c2b33bde0b7b1f47a925126e3e73861 (diff) | |
download | gitlab-ce-b0d0c808f5e887391fb5554ac64ed7fd8e3c5ec2.tar.gz |
Merge branch 'rd-add-additional-notes-for-extra-ci-minutes-purchase-docs' into 'master'
Update CI minutes docs regarding transferring of minutes and billing
See merge request gitlab-org/gitlab-ce!28293
(cherry picked from commit ac232949952559d8441e743219dc726aed552f3c)
6a2875e1 Update extra CI minutes docs
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 42fc4efa4ce..9dd476656ed 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -118,7 +118,15 @@ will be synced to your Group and you can visualize it from the ![Additional minutes](img/additional_minutes.png) -NOTE: **Important note**: If you have some minutes used over your default quota, these minutes will +Be aware that: + +1. If you have purchased extra CI minutes before the purchase of a paid plan, +we will calculate a pro-rated charge for your paid plan. That means you may +be charged for less than one year since your subscription was previously +created with the extra CI minutes. +1. Once the extra CI minutes has been assigned to a Group they cannot be transferred +to a different Group. +1. If you have some minutes used over your default quota, these minutes will be deducted from your Additional Minutes quota immediately after your purchase of additional minutes. |