diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-06-24 19:32:17 +0000 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-26 11:13:24 +0530 |
| commit | b2d2a1b7300b312bc520f0dceb54f916af1ca4c8 (patch) | |
| tree | 6993a6d6b207e58295e5ff3f4caa610445187b2d | |
| parent | 394ad4028883b4881324e6a654645c8a17f90851 (diff) | |
| download | gitlab-ce-b2d2a1b7300b312bc520f0dceb54f916af1ca4c8.tar.gz | |
Merge branch '34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-in-docs' into 'master'
Resolve "Replace 'Settings ➔ CI/CD Pipelines' with 'Settings ➔ Pipelines' in docs"
Closes #34264
See merge request !12433
| -rw-r--r-- | doc/ci/quick_start/README.md | 6 | ||||
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md index 41cae58782d..88e53ff40e8 100644 --- a/doc/ci/quick_start/README.md +++ b/doc/ci/quick_start/README.md @@ -155,7 +155,7 @@ Find more information about different Runners in the [Runners](../runners/README.md) documentation. You can find whether any Runners are assigned to your project by going to -**Settings ➔ CI/CD Pipelines**. Setting up a Runner is easy and straightforward. The +**Settings ➔ Pipelines**. Setting up a Runner is easy and straightforward. The official Runner supported by GitLab is written in Go and its documentation can be found at <https://docs.gitlab.com/runner/>. @@ -168,7 +168,7 @@ Follow the links above to set up your own Runner or use a Shared Runner as described in the next section. Once the Runner has been set up, you should see it on the Runners page of your -project, following **Settings ➔ CI/CD Pipelines**. +project, following **Settings ➔ Pipelines**.  @@ -181,7 +181,7 @@ These are special virtual machines that run on GitLab's infrastructure and can build any project. To enable the **Shared Runners** you have to go to your project's -**Settings ➔ CI/CD Pipelines** and click **Enable shared runners**. +**Settings ➔ Pipelines** and click **Enable shared runners**. [Read more on Shared Runners](../runners/README.md). diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 1d2eba4f74b..a992a348c0f 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -1,7 +1,7 @@ # Pipelines settings To reach the pipelines settings navigate to your project's -**Settings ➔ CI/CD Pipelines**. +**Settings ➔ Pipelines**. The following settings can be configured per project. |