diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:09:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:09:11 +0300 |
commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /doc/user/admin_area/settings/continuous_integration.md | |
parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings/continuous_integration.md')
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 43b0671d9e0..da982acd28e 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -86,7 +86,7 @@ artifacts, as described in the [troubleshooting documentation](../../../administ ## Shared Runners pipeline minutes quota **(STARTER ONLY)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/1078) +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1078) in GitLab Starter 8.16. If you have enabled shared Runners for your GitLab instance, you can limit their @@ -143,7 +143,7 @@ for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>. ## Default CI configuration path -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/18073) in GitLab 12.5. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18073) in GitLab 12.5. The default CI configuration file path for new projects can be set in the Admin Area of your GitLab instance (`.gitlab-ci.yml` if not set): |