summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-10-09 20:43:58 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-10-09 20:43:58 +0000
commitf9bedcfc08bc454e6864df47a7ca0d76b75c634f (patch)
tree7c0129eb17f7058dec2c8caa3829f87723c22027
parent835a2a4cbb4bcf56895329418c516aeca1e3f185 (diff)
parentad5ce3e91232a15b1d19ec09af31ba2d39670df5 (diff)
downloadgitlab-ce-f9bedcfc08bc454e6864df47a7ca0d76b75c634f.tar.gz
Merge branch 'patch-28' into 'master'
Remove duplicated item in Administration Documentation See merge request gitlab-org/gitlab-ce!21933
-rw-r--r--doc/administration/index.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md
index d713247983b..8e6fa9563c7 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -118,10 +118,9 @@ created in snippets, wikis, and repos.
## Continuous Integration settings
- [Enable/disable GitLab CI/CD](../ci/enable_or_disable_ci.md#site-wide-admin-setting): Enable or disable GitLab CI/CD for your instance.
-- [GitLab CI/CD admin settings](../user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time.
+- [GitLab CI/CD admin settings](../user/admin_area/settings/continuous_integration.md): Enable or disable Auto DevOps site-wide and define the artifacts' max size and expiration time.
- [Job artifacts](job_artifacts.md): Enable, disable, and configure job artifacts (a set of files and directories which are outputted by a job when it completes successfully).
- [Job traces](job_traces.md): Information about the job traces (logs).
-- [Artifacts size and expiration](../user/admin_area/settings/continuous_integration.md#maximum-artifacts-size): Define maximum artifacts limits and expiration date.
- [Register Shared and specific Runners](../ci/runners/README.md#registering-a-shared-runner): Learn how to register and configure Shared and specific Runners to your own instance.
- [Shared Runners pipelines quota](../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota): Limit the usage of pipeline minutes for Shared Runners.
- [Enable/disable Auto DevOps](../topics/autodevops/index.md#enabling-auto-devops): Enable or disable Auto DevOps for your instance.