Commit a4407e75 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents a5a5f5fe 9189cffb
...@@ -7,7 +7,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
def update def update
if @project.update_attributes(update_params) if @project.update_attributes(update_params)
flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' were successfully updated." flash[:notice] = "Pipelines settings for '#{@project.name}' were successfully updated."
redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project) redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
else else
render 'show' render 'show'
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
- unless @repository.gitlab_ci_yml - unless @repository.gitlab_ci_yml
= link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info' = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI lint %span CI lint
......
.row.prepend-top-default .row.prepend-top-default
.col-lg-3.profile-settings-sidebar .col-lg-3.profile-settings-sidebar
%h4.prepend-top-0 %h4.prepend-top-0
CI/CD Pipelines Pipelines
.col-lg-9 .col-lg-9
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f| = form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f|
%fieldset.builds-feature %fieldset.builds-feature
- unless @repository.gitlab_ci_yml - unless @repository.gitlab_ci_yml
.form-group .form-group
%p Pipelines need to be configured before you can begin using Continuous Integration. %p Pipelines need to be configured before you can begin using Continuous Integration.
= link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info' = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
%hr %hr
.form-group.append-bottom-default .form-group.append-bottom-default
= f.label :runners_token, "Runner token", class: 'label-light' = f.label :runners_token, "Runner token", class: 'label-light'
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
Repository Repository
- if @project.feature_available?(:builds, current_user) - if @project.feature_available?(:builds, current_user)
= nav_link(controller: :ci_cd) do = nav_link(controller: :ci_cd) do
= link_to namespace_project_settings_ci_cd_path(@project.namespace, @project), title: 'CI/CD Pipelines' do = link_to namespace_project_settings_ci_cd_path(@project.namespace, @project), title: 'Pipelines' do
%span %span
CI/CD Pipelines Pipelines
- if Gitlab.config.pages.enabled - if Gitlab.config.pages.enabled
= nav_link(controller: :pages) do = nav_link(controller: :pages) do
= link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do
......
- page_title "CI/CD Pipelines" - page_title "Pipelines"
= render "projects/settings/head" = render "projects/settings/head"
= render 'projects/runners/index' = render 'projects/runners/index'
......
---
title: Rename CI/CD Pipelines to Pipelines in the project settings
merge_request:
author:
# GitLab Continuous Integration (GitLab CI) # GitLab Continuous Integration (GitLab CI)
![CI/CD pipeline graph](img/cicd_pipeline_infograph.png) ![Pipeline graph](img/cicd_pipeline_infograph.png)
The benefits of Continuous Integration are huge when automation plays an The benefits of Continuous Integration are huge when automation plays an
integral part of your workflow. GitLab comes with built-in Continuous integral part of your workflow. GitLab comes with built-in Continuous
...@@ -86,7 +86,7 @@ You can change the default behavior of GitLab CI in your whole GitLab instance ...@@ -86,7 +86,7 @@ You can change the default behavior of GitLab CI in your whole GitLab instance
as well as in each project. as well as in each project.
- **Project specific** - **Project specific**
- [CI/CD pipelines settings](../user/project/pipelines/settings.md) - [Pipelines settings](../user/project/pipelines/settings.md)
- [Learn how to enable or disable GitLab CI](enable_or_disable_ci.md) - [Learn how to enable or disable GitLab CI](enable_or_disable_ci.md)
- **Affecting the whole GitLab instance** - **Affecting the whole GitLab instance**
- [Continuous Integration admin settings](../user/admin_area/settings/continuous_integration.md) - [Continuous Integration admin settings](../user/admin_area/settings/continuous_integration.md)
......
...@@ -111,7 +111,7 @@ We also use two secure variables: ...@@ -111,7 +111,7 @@ We also use two secure variables:
## Storing API keys ## Storing API keys
Secure Variables can added by going to your project's Secure Variables can added by going to your project's
**Settings ➔ CI/CD Pipelines ➔ Secret variables**. The variables that are defined **Settings ➔ Pipelines ➔ Secret variables**. The variables that are defined
in the project settings are sent along with the build script to the Runner. in the project settings are sent along with the build script to the Runner.
The secure variables are stored out of the repository. Never store secrets in The secure variables are stored out of the repository. Never store secrets in
your project's `.gitlab-ci.yml`. It is also important that the secret's value your project's `.gitlab-ci.yml`. It is also important that the secret's value
......
...@@ -54,7 +54,7 @@ You can use other versions of Scala and SBT by defining them in ...@@ -54,7 +54,7 @@ You can use other versions of Scala and SBT by defining them in
## Display test coverage in job ## Display test coverage in job
Add the `Coverage was \[\d+.\d+\%\]` regular expression in the Add the `Coverage was \[\d+.\d+\%\]` regular expression in the
**Settings ➔ CI/CD Pipelines ➔ Coverage report** project setting to **Settings ➔ Pipelines ➔ Coverage report** project setting to
retrieve the [test coverage] rate from the build trace and have it retrieve the [test coverage] rate from the build trace and have it
displayed with your jobs. displayed with your jobs.
......
...@@ -12,7 +12,7 @@ with an API call. ...@@ -12,7 +12,7 @@ with an API call.
## Add a trigger ## Add a trigger
You can add a new trigger by going to your project's You can add a new trigger by going to your project's
**Settings ➔ CI/CD Pipelines ➔ Triggers**. The **Add trigger** button will **Settings ➔ Pipelines ➔ Triggers**. The **Add trigger** button will
create a new token which you can then use to trigger a rerun of this create a new token which you can then use to trigger a rerun of this
particular project's pipeline. particular project's pipeline.
...@@ -60,7 +60,7 @@ POST /projects/:id/trigger/pipeline ...@@ -60,7 +60,7 @@ POST /projects/:id/trigger/pipeline
The required parameters are the trigger's `token` and the Git `ref` on which The required parameters are the trigger's `token` and the Git `ref` on which
the trigger will be performed. Valid refs are the branch and the tag. The `:id` the trigger will be performed. Valid refs are the branch and the tag. The `:id`
of a project can be found by [querying the API](../../api/projects.md) of a project can be found by [querying the API](../../api/projects.md)
or by visiting the **CI/CD Pipelines** settings page which provides or by visiting the **Pipelines** settings page which provides
self-explanatory examples. self-explanatory examples.
When a rerun of a pipeline is triggered, the information is exposed in GitLab's When a rerun of a pipeline is triggered, the information is exposed in GitLab's
......
...@@ -152,7 +152,7 @@ available in the build environment. It's the recommended method to use for ...@@ -152,7 +152,7 @@ available in the build environment. It's the recommended method to use for
storing things like passwords, secret keys and credentials. storing things like passwords, secret keys and credentials.
Secret variables can be added by going to your project's Secret variables can be added by going to your project's
**Settings ➔ CI/CD Pipelines**, then finding the section called **Settings ➔ Pipelines**, then finding the section called
**Secret Variables**. **Secret Variables**.
Once you set them, they will be available for all subsequent jobs. Once you set them, they will be available for all subsequent jobs.
......
...@@ -174,7 +174,7 @@ users: ...@@ -174,7 +174,7 @@ users:
| Push container images to other projects | | | | | | Push container images to other projects | | | | |
[^1]: Guest users can only view the confidential issues they created themselves [^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 [^3]: Not allowed for Guest, Reporter, Developer, Master, or Owner
[^4]: Only if user is not external one. [^4]: Only if user is not external one.
[^5]: Only if user is a member of the project. [^5]: Only if user is a member of the project.
......
...@@ -100,7 +100,7 @@ In versions before GitLab 8.12, all CI jobs would use the CI Runner's token ...@@ -100,7 +100,7 @@ In versions before GitLab 8.12, all CI jobs would use the CI Runner's token
to checkout project sources. to checkout project sources.
The project's Runner's token was a token that you could find under the 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. project.
It could be used for registering new specific Runners assigned to the project It could be used for registering new specific Runners assigned to the project
and to checkout project sources. and to checkout project sources.
......
...@@ -57,7 +57,7 @@ created for the steps below. ...@@ -57,7 +57,7 @@ created for the steps below.
![remove fork relashionship](img/remove_fork_relashionship.png) ![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. 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** 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**
......
# CI/CD pipelines settings # Pipelines settings
To reach the pipelines settings: To reach the pipelines settings:
...@@ -6,7 +6,7 @@ To reach the pipelines settings: ...@@ -6,7 +6,7 @@ To reach the pipelines settings:
![Project settings menu](../img/project_settings_list.png) ![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. The following settings can be configured per project.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment