summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielgruesso <dgruesso@gitlab.com>2018-10-17 10:51:16 -0400
committerdanielgruesso <dgruesso@gitlab.com>2018-10-17 10:51:16 -0400
commitaf7b9a7a13d9e8092b48cd9089e2d91217be854a (patch)
tree95fa72fd20b16e22bc73ecf5a49767d25691ec56
parenta118e9999e628dd0ef768c48f164e95009ca5132 (diff)
downloadgitlab-ce-af7b9a7a13d9e8092b48cd9089e2d91217be854a.tar.gz
Further clarification on instance level vs project level enablement.
-rw-r--r--doc/topics/autodevops/index.md20
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 7c43332cca6..d4bf66c49da 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -4,7 +4,7 @@
Auto DevOps provides pre-defined CI configuration which will automatically detect, build, test,
deploy, and monitor your applications. Leveraging CI best practices and tools, Auto DevOps aims
-to simplify the setup and execution of a modern software development lifecycle.
+to simplify the setup and execution of a mature & modern software development lifecycle.
## Overview
@@ -207,6 +207,17 @@ full use of Auto DevOps are available. If this is your fist time, we recommend y
GitLab.com users can enable/disable Auto DevOps at the project-level only. Self-managed users
can enable/disable Auto DevOps at either the project-level or instance-level.
+### Enable/disable Auto DevOps at the instance-level (Administrators only)
+
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**
+1. Check (or uncheck to disable) the box that reads "Default to Auto DevOps pipeline for all projects"
+1. Optionally, set up the Auto DevOps [base domain](#auto-devops-base-domain) which is going to be used for Auto Deploy and Auto Review Apps.
+1. Click **Save changes** for the changes to take effect.
+
+NOTE: **Note:**
+Even when disabled at the instance-level, project maintainers will still be able to enable
+Auto DevOps at the project-level.
+
### Enable/disable Auto DevOps at the project-level
1. Check that your project doesn't have a `.gitlab-ci.yml`, or remove it otherwise
@@ -217,13 +228,6 @@ can enable/disable Auto DevOps at either the project-level or instance-level.
and choose the [deployment strategy](#deployment-strategy)
1. Hit **Save changes** for the changes to take effect
-### Enable/disable Auto DevOps at the instance-level (Administrators only)
-
-1. Go to **Admin area > Settings > Continuous Integration and Deployment**
-1. Check (or uncheck to disable) the box that reads "Default to Auto DevOps pipeline for all projects"
-1. Optionally, set up the Auto DevOps [base domain](#auto-devops-base-domain) which is going to be used for Auto Deploy and Auto Review Apps.
-1. Click **Save changes** for the changes to take effect.
-
Once saved, an Auto DevOps pipeline will be triggered on the default branch.
NOTE: **Note:**