diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-15 15:53:35 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-15 21:40:55 +0300 |
| commit | 8f74bb89cb0964c6cbf97a015c397c612cdeb22b (patch) | |
| tree | a4dcc2df4223d79407119418773a7f3ba6b9e7f2 /doc | |
| parent | 55476813ecb6f57b08f6c12403f5a963a1511fc3 (diff) | |
Merge branch '43231-document-the-instance-level-auto-devops-domain-option' into 'master'
Resolve "Document the instance level Auto DevOps domain option"
Closes #43231
See merge request gitlab-org/gitlab-ce!17132
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/topics/autodevops/index.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 01bd925bd6f..5f5ba2b69bc 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -95,7 +95,9 @@ Auto Deploy, and Auto Monitoring will be silently skipped. The Auto DevOps base domain is required if you want to make use of [Auto Review Apps](#auto-review-apps) and [Auto Deploy](#auto-deploy). It is defined -under the project's CI/CD settings while [enabling Auto DevOps](#enabling-auto-devops). +either under the project's CI/CD settings while +[enabling Auto DevOps](#enabling-auto-devops) or in instance-wide settings in +the CI/CD section. It can also be set at the project or group level as a variable, `AUTO_DEVOPS_DOMAIN`. A wildcard DNS A record matching the base domain is required, for example, |