Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master'

Resolve "`Set up CI` => `Set up CI/CD`"

Closes #42684

See merge request gitlab-org/gitlab-ce!16870

6 files changed, 15 insertions, 10 deletions

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index d3e867e124c..888d820b04e 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -47,7 +47,7 @@
 
       - if @repository.gitlab_ci_yml
         %li
-          = link_to _('CI configuration'), ci_configuration_path(@project)
+          = link_to _('CI/CD configuration'), ci_configuration_path(@project)
 
       - if current_user && can_push_branch?(@project, @project.default_branch)
         - unless @repository.changelog
@@ -65,7 +65,7 @@
         - unless @repository.gitlab_ci_yml
           %li.missing
             = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
-              #{ _('Set up CI') }
+              #{ _('Set up CI/CD') }
         - if koding_enabled? && @repository.koding_yml.blank?
           %li.missing
             = link_to  _('Set up Koding'), add_koding_stack_path(@project)
diff --git a/changelogs/unreleased/42684-set-up-ci-set-up-ci-cd.yml b/changelogs/unreleased/42684-set-up-ci-set-up-ci-cd.yml
new file mode 100644
index 00000000000..0ef28e2ee01
--- /dev/null
+++ b/changelogs/unreleased/42684-set-up-ci-set-up-ci-cd.yml
@@ -0,0 +1,5 @@
+---
+title: Rename button to enable CI/CD configuration to "Set up CI/CD"
+merge_request: 16870
+author:
+type: changed
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 144cd4c26b0..0fab752afad 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -395,7 +395,7 @@ If you want to modify the CI/CD pipeline used by Auto DevOps, you can copy the
 Assuming that your project is new or it doesn't have a `.gitlab-ci.yml` file
 present:
 
-1. From your project home page, either click on the "Set up CI" button, or click
+1. From your project home page, either click on the "Set up CI/CD" button, or click
    on the plus button and (`+`), then "New file"
 1. Pick `.gitlab-ci.yml` as the template type
 1. Select "Auto-DevOps" from the template dropdown
diff --git a/doc/user/project/pages/getting_started_part_two.md b/doc/user/project/pages/getting_started_part_two.md
index 64de0463dad..4a724dd5c1b 100644
--- a/doc/user/project/pages/getting_started_part_two.md
+++ b/doc/user/project/pages/getting_started_part_two.md
@@ -77,7 +77,7 @@ is useful for submitting merge requests to the upstream.
 >
 > 2. Why do I need to enable Shared Runners?
 >
->     Shared Runners will run the script set by your GitLab CI
+>     Shared Runners will run the script set by your GitLab CI/CD
 configuration file. They're enabled by default to new projects,
 but not to forks.
 
@@ -88,9 +88,9 @@ click **New project**, and name it considering the
 [practical examples](getting_started_part_one.md#practical-examples).
 1. Clone it to your local computer, add your website
 files to your project, add, commit and push to GitLab.
-1. From the your **Project**'s page, click **Set up CI**:
+1. From the your **Project**'s page, click **Set up CI/CD**:
 
-    ![setup GitLab CI](img/setup_ci.png)
+    ![setup GitLab CI/CD](img/setup_ci.png)
 
 1. Choose one of the templates from the dropbox menu.
 Pick up the template corresponding to the SSG you're using (or plain HTML).
@@ -98,7 +98,7 @@ Pick up the template corresponding to the SSG you're using (or plain HTML).
     ![gitlab-ci templates](img/choose_ci_template.png)
 
 Once you have both site files and `.gitlab-ci.yml` in your project's
-root, GitLab CI will build your site and deploy it with Pages.
+root, GitLab CI/CD will build your site and deploy it with Pages.
 Once the first build passes, you see your site is live by
 navigating to your **Project**'s **Settings** > **Pages**,
 where you'll find its default URL.
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md
index db0c3ed9d59..33c9a1a4d6b 100644
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
@@ -45,7 +45,7 @@ has already been created, which creates a link to the license itself.
 ![New file button](img/web_editor_template_dropdown_buttons.png)
 
 >**Note:**
-The **Set up CI** button will not appear on an empty repository. You have to at
+The **Set up CI/CD** button will not appear on an empty repository. You have to at
 least add a file in order for the button to show up.
 
 ## Upload a file
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 94458d60e01..075103eb0de 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -363,7 +363,7 @@ msgstr ""
 msgid "CI / CD"
 msgstr ""
 
-msgid "CI configuration"
+msgid "CI/CD configuration"
 msgstr ""
 
 msgid "CICD|Jobs"
@@ -2087,7 +2087,7 @@ msgstr ""
 msgid "Set a password on your account to pull or push via %{protocol}."
 msgstr ""
 
-msgid "Set up CI"
+msgid "Set up CI/CD"
 msgstr ""
 
 msgid "Set up Koding"