summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-08-10 17:07:30 +0200
committerAchilleas Pipinellis <axil@gitlab.com>2018-09-14 16:28:31 +0200
commitc019030809d83f46d3ef65bae806e9f2c3404ec9 (patch)
tree24b1b1d03f451a320951e4c1e59683b78d6f7a21
parentb92b7d822226724db76b8dfb61dca438ea8dbb1c (diff)
downloadgitlab-ce-c019030809d83f46d3ef65bae806e9f2c3404ec9.tar.gz
Document how to enable Auto DevOps at the instance level
-rw-r--r--doc/user/admin_area/img/admin_area_settings_button.pngbin0 -> 7993 bytes
-rw-r--r--doc/user/admin_area/settings/continuous_integration.md60
-rw-r--r--doc/user/admin_area/settings/img/admin_area_settings_button.pngbin4403 -> 0 bytes
-rw-r--r--doc/user/admin_area/settings/index.md22
4 files changed, 58 insertions, 24 deletions
diff --git a/doc/user/admin_area/img/admin_area_settings_button.png b/doc/user/admin_area/img/admin_area_settings_button.png
new file mode 100644
index 00000000000..315ef40a375
--- /dev/null
+++ b/doc/user/admin_area/img/admin_area_settings_button.png
Binary files differ
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 76d9a4ceb03..6025a5bbcda 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -1,39 +1,51 @@
-# Continuous integration Admin settings
+# Continuous Integration and Deployment Admin settings **[CORE ONLY]**
-## Maximum artifacts size
+In this area, you will find settings for Auto DevOps, Runners and job artifacts.
+You can find it in the admin area, under **Settings > Continuous Integration and Deployment**.
-The maximum size of the [job artifacts][art-yml] can be set in the Admin area
-of your GitLab instance. The value is in *MB* and the default is 100MB. Note
-that this setting is set for each job.
-
-1. Go to **Admin area > Settings** (`/admin/application_settings`).
+![Admin area settings button](../img/admin_area_settings_button.png)
- ![Admin area settings button](img/admin_area_settings_button.png)
+## Auto DevOps **[CORE ONLY]**
-1. Change the value of maximum artifacts size (in MB):
+To enable (or disable) [Auto DevOps](../../../topics/autodevops/index.md)
+for all projects:
- ![Admin area maximum artifacts size](img/admin_area_maximum_artifacts_size.png)
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**.
+1. Check (or uncheck to disable) the box that says "Default to Auto DevOps pipeline for all projects".
+1. Optionally, set up the [Auto DevOps base domain](../../../topics/autodevops/index.md#auto-devops-base-domain)
+ which is going to be used for Auto Deploy and Auto Review Apps.
+1. Hit **Save changes** for the changes to take effect.
-1. Hit **Save** for the changes to take effect.
+From now on, every existing project and newly created ones that don't have a
+`.gitlab-ci.yml`, will use the Auto DevOps pipelines.
-## Default artifacts expiration
+If you want to disable it for a specific project, you can do so in
+[its settings](../../../topics/autodevops/index.md#enabling-auto-devops).
-The default expiration time of the [job artifacts][art-yml] can be set in
-the Admin area of your GitLab instance. The syntax of duration is described
-in [artifacts:expire_in][duration-syntax]. The default is `30 days`. Note that
-this setting is set for each job. Set it to `0` if you don't want default
-expiration. The default unit is in seconds.
+## Maximum artifacts size **[CORE ONLY]**
+The maximum size of the [job artifacts][art-yml] can be set in the Admin area
+of your GitLab instance. The value is in *MB* and the default is 100MB per job;
+on GitLab.com it's [set to 1G](../../gitlab_com/index.md#gitlab-ci-cd).
-1. Go to **Admin area > Settings** (`/admin/application_settings`).
+To change it:
- ![Admin area settings button](img/admin_area_settings_button.png)
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**.
+1. Change the value of maximum artifacts size (in MB).
+1. Hit **Save changes** for the changes to take effect.
-1. Change the value of default expiration time ([syntax][duration-syntax]):
+## Default artifacts expiration **[CORE ONLY]**
- ![Admin area default artifacts expiration](img/admin_area_default_artifacts_expiration.png)
+The default expiration time of the [job artifacts](../../../administration/job_artifacts.md)
+can be set in the Admin area of your GitLab instance. The syntax of duration is
+described in [`artifacts:expire_in`](../../../ci/yaml/README.md#artifacts-expire_in)
+and the default value is `30 days`. On GitLab.com they
+[never expire](../../gitlab_com/index.md#gitlab-ci-cd).
-1. Hit **Save** for the changes to take effect.
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**.
+1. Change the value of default expiration time.
+1. Hit **Save changes** for the changes to take effect.
-[art-yml]: ../../../administration/job_artifacts.md
-[duration-syntax]: ../../../ci/yaml/README.md#artifactsexpire_in
+This setting is set per job and can be overridden in
+[`.gitlab-ci.yml`](../../../ci/yaml/README.md#artifacts-expire_in).
+To disable the expiration, set it to `0`. The default unit is in seconds.
diff --git a/doc/user/admin_area/settings/img/admin_area_settings_button.png b/doc/user/admin_area/settings/img/admin_area_settings_button.png
deleted file mode 100644
index 1d2c0ac04bc..00000000000
--- a/doc/user/admin_area/settings/img/admin_area_settings_button.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
new file mode 100644
index 00000000000..93767aefb51
--- /dev/null
+++ b/doc/user/admin_area/settings/index.md
@@ -0,0 +1,22 @@
+# Admin area settings **[CORE ONLY]**
+
+In the admin area settings, you can find various options for your GitLab
+instance like sign-up restrictions, account limits and quota, metrics, etc.
+
+Navigate to it by going to **Admin area > Settings**. Some of the settings
+include:
+
+- [Continuous Integration and Deployment](continuous_integration.md)
+- [Email](email.md)
+- [Sign up restrictions](sign_up_restrictions.md)
+- [Terms](terms.md)
+- [Third party offers](third_party_offers.md)
+- [Usage statistics](usage_statistics.md)
+- [Visibility and access controls](visibility_and_access_controls.md)
+
+## GitLab.com admin area settings
+
+Most of the settings under the admin area change the behavior of the whole
+GitLab instance. For GitLab.com, the admin settings are available only for the
+GitLab.com administrators, and the parameters can be found on the
+[GitLab.com settings](../../gitlab_com/index.md) documentation.