diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-14 16:56:28 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-14 16:56:28 +0000 |
| commit | 7b67d3d3917a88e2e627dc152955b08488fda57c (patch) | |
| tree | dcdb040e1d75b8131f1f685a2e3bdf8b49234638 | |
| parent | c9cb9a8c382c6f741c6ef8c3ef0c73666b2a54b6 (diff) | |
| parent | 4d3f2ff1f27bc65dbfa9a3ffb6b64fc88a4cd9a0 (diff) | |
| download | gitlab-ce-7b67d3d3917a88e2e627dc152955b08488fda57c.tar.gz | |
Merge branch '27656-doc-ci-enable-ci' into 'master'
Update doc for enabling or disabling GitLab CI
Closes #27656
See merge request !8965
| -rw-r--r-- | changelogs/unreleased/27656-doc-ci-enable-ci.yml | 4 | ||||
| -rw-r--r-- | doc/ci/enable_or_disable_ci.md | 18 | ||||
| -rw-r--r-- | doc/ci/img/features_settings.png | bin | 9243 -> 0 bytes | |||
| -rw-r--r-- | doc/ci/img/permissions_settings.png | bin | 0 -> 39194 bytes |
4 files changed, 13 insertions, 9 deletions
diff --git a/changelogs/unreleased/27656-doc-ci-enable-ci.yml b/changelogs/unreleased/27656-doc-ci-enable-ci.yml new file mode 100644 index 00000000000..e6315d683d4 --- /dev/null +++ b/changelogs/unreleased/27656-doc-ci-enable-ci.yml @@ -0,0 +1,4 @@ +--- +title: Update doc for enabling or disabling GitLab CI +merge_request: 8965 +author: Takuya Noguchi 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. - + --- diff --git a/doc/ci/img/features_settings.png b/doc/ci/img/features_settings.png Binary files differdeleted file mode 100644 index c159253d1c9..00000000000 --- a/doc/ci/img/features_settings.png +++ /dev/null diff --git a/doc/ci/img/permissions_settings.png b/doc/ci/img/permissions_settings.png Binary files differnew file mode 100644 index 00000000000..1454c75fd24 --- /dev/null +++ b/doc/ci/img/permissions_settings.png |
