From 4d3f2ff1f27bc65dbfa9a3ffb6b64fc88a4cd9a0 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Sat, 4 Feb 2017 03:24:17 +0900 Subject: Update doc for enabling or disabling GitLab CI --- doc/ci/enable_or_disable_ci.md | 18 +++++++++--------- doc/ci/img/features_settings.png | Bin 9243 -> 0 bytes doc/ci/img/permissions_settings.png | Bin 0 -> 39194 bytes 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 doc/ci/img/features_settings.png create mode 100644 doc/ci/img/permissions_settings.png (limited to 'doc/ci') diff --git a/doc/ci/enable_or_disable_ci.md b/doc/ci/enable_or_disable_ci.md index c10f82054e2..7971daf2637 100644 --- a/doc/ci/enable_or_disable_ci.md +++ b/doc/ci/enable_or_disable_ci.md @@ -11,10 +11,10 @@ API. --- -As of GitLab 8.2, GitLab CI is mainly exposed via the `/builds` page of a -project. Disabling GitLab CI in a project does not delete any previous builds. -In fact, the `/builds` page can still be accessed, although it's hidden from -the left sidebar menu. +GitLab CI is exposed via the `/pipelines` and `/builds` pages of a project. +Disabling GitLab CI in a project does not delete any previous builds. +In fact, the `/pipelines` and `/builds` pages can still be accessed, although +it's hidden from the left sidebar menu. GitLab CI is enabled by default on new installations and can be disabled either individually under each project's settings, or site-wide by modifying the @@ -23,12 +23,12 @@ respectively. ### Per-project user setting -The setting to enable or disable GitLab CI can be found with the name **Builds** -under the **Features** area of a project's settings along with **Issues**, -**Merge Requests**, **Wiki** and **Snippets**. Select or deselect the checkbox -and hit **Save** for the settings to take effect. +The setting to enable or disable GitLab CI can be found with the name **Pipelines** +under the **Sharing & Permissions** area of a project's settings along with +**Merge Requests**. Choose one of **Disabled**, **Only team members** and +**Everyone with access** and hit **Save changes** for the settings to take effect. -![Features settings](img/features_settings.png) +![Sharing & Permissions settings](img/permissions_settings.png) --- diff --git a/doc/ci/img/features_settings.png b/doc/ci/img/features_settings.png deleted file mode 100644 index c159253d1c9..00000000000 Binary files a/doc/ci/img/features_settings.png and /dev/null differ diff --git a/doc/ci/img/permissions_settings.png b/doc/ci/img/permissions_settings.png new file mode 100644 index 00000000000..1454c75fd24 Binary files /dev/null and b/doc/ci/img/permissions_settings.png differ -- cgit v1.2.1