summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-22 14:17:48 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-22 14:17:48 +0000
commita4407e75d374f65d8638d40eadbd0ec8c32cd6f6 (patch)
treeb79e17cac9ca5290b728458b3592891576e8700d /doc/user
parenta5a5f5fe27b494e72db9c4130a9869309f0d5ecf (diff)
parent9189cffb937d0f8db41733f7700bf9969222b036 (diff)
downloadgitlab-ce-a4407e75d374f65d8638d40eadbd0ec8c32cd6f6.tar.gz
Merge branch 'dz-rename-pipelines-settings-tab' into 'master'
Rename CI/CD Pipelines to Pipelines in the project settings Closes #31980 See merge request !11305
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/permissions.md2
-rw-r--r--doc/user/project/new_ci_build_permissions_model.md2
-rw-r--r--doc/user/project/pages/getting_started_part_two.md2
-rw-r--r--doc/user/project/pipelines/settings.md4
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 637967510f3..b0145b0a759 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -174,7 +174,7 @@ users:
| Push container images to other projects | | | | |
[^1]: Guest users can only view the confidential issues they created themselves
-[^2]: If **Public pipelines** is enabled in **Project Settings > CI/CD Pipelines**
+[^2]: If **Public pipelines** is enabled in **Project Settings > Pipelines**
[^3]: Not allowed for Guest, Reporter, Developer, Master, or Owner
[^4]: Only if user is not external one.
[^5]: Only if user is a member of the project.
diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md
index 051a28efea6..e9512497d6c 100644
--- a/doc/user/project/new_ci_build_permissions_model.md
+++ b/doc/user/project/new_ci_build_permissions_model.md
@@ -100,7 +100,7 @@ In versions before GitLab 8.12, all CI jobs would use the CI Runner's token
to checkout project sources.
The project's Runner's token was a token that you could find under the
-project's **Settings > CI/CD Pipelines** and was limited to access only that
+project's **Settings > Pipelines** and was limited to access only that
project.
It could be used for registering new specific Runners assigned to the project
and to checkout project sources.
diff --git a/doc/user/project/pages/getting_started_part_two.md b/doc/user/project/pages/getting_started_part_two.md
index c91e2d8c261..64de0463dad 100644
--- a/doc/user/project/pages/getting_started_part_two.md
+++ b/doc/user/project/pages/getting_started_part_two.md
@@ -57,7 +57,7 @@ created for the steps below.
![remove fork relashionship](img/remove_fork_relashionship.png)
-1. Enable Shared Runners for your fork: navigate to your **Project**'s **Settings** > **CI/CD Pipelines**
+1. Enable Shared Runners for your fork: navigate to your **Project**'s **Settings** > **Pipelines**
1. Trigger a build (push a change to any file)
1. As soon as the build passes, your website will have been deployed with GitLab Pages. Your website URL will be available under your **Project**'s **Settings** > **Pages**
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index 88246e22391..1b42c43cf8f 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -1,4 +1,4 @@
-# CI/CD pipelines settings
+# Pipelines settings
To reach the pipelines settings:
@@ -6,7 +6,7 @@ To reach the pipelines settings:
![Project settings menu](../img/project_settings_list.png)
-1. Select **CI/CD Pipelines** from the menu.
+1. Select **Pipelines** from the menu.
The following settings can be configured per project.