Merge branch 'docs-rename-skip-outdated-jobs' into 'master'

Rename feature to "Skip outdated deployment jobs"

Closes #211480

See merge request gitlab-org/gitlab!27659

app/views/projects/settings/ci_cd/_form.html.haml

@@ -92,10 +92,10 @@
           .form-check
             = f.check_box :forward_deployment_enabled, { class: 'form-check-input' }
             = f.label :forward_deployment_enabled, class: 'form-check-label' do
-              %strong= _("Skip older, pending deployment jobs")
+              %strong= _("Skip outdated deployment jobs")
             .form-text.text-muted
               = _("When a deployment job is successful, skip older deployment jobs that are still pending")
-              = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'skip-older-pending-deployment-jobs'), target: '_blank'
+              = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'skip-outdated-deployment-jobs'), target: '_blank'
 
         %hr
         .form-group

changelogs/unreleased/docs-rename-skip-outdated-jobs.yml

+---
+title: Rename feature on the FE and locale
+merge_request:
+author:
+type: changed

doc/ci/pipelines/settings.md

@@ -192,7 +192,7 @@ you can enable this in the project settings:
 1. Check the **Auto-cancel redundant, pending pipelines** checkbox.
 1. Click **Save changes**.
 
-## Skip older, pending deployment jobs
+## Skip outdated deployment jobs
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25276) in GitLab 12.9.
 
@@ -206,7 +206,7 @@ To avoid this scenario:
 
 1. Go to **{settings}** **Settings > CI / CD**.
 1. Expand **General pipelines**.
-1. Check the **Skip older, pending deployment jobs** checkbox.
+1. Check the **Skip outdated deployment jobs** checkbox.
 1. Click **Save changes**.
 
 The pending deployment jobs will be skipped.

locale/gitlab.pot

@@ -18323,7 +18323,7 @@ msgstr ""
 msgid "Size settings for static websites"
 msgstr ""
 
-msgid "Skip older, pending deployment jobs"
+msgid "Skip outdated deployment jobs"
 msgstr ""
 
 msgid "Skip this for now"