Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d3023e7
Commit
7d3023e7
authored
Mar 20, 2020
by
Marcia Ramos
Committed by
Andrew Fontaine
Mar 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename to Skip outdated deployment jobs
Add deployment to all files
parent
83a67aaa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/projects/settings/ci_cd/_form.html.haml
app/views/projects/settings/ci_cd/_form.html.haml
+2
-2
changelogs/unreleased/docs-rename-skip-outdated-jobs.yml
changelogs/unreleased/docs-rename-skip-outdated-jobs.yml
+5
-0
doc/ci/pipelines/settings.md
doc/ci/pipelines/settings.md
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/views/projects/settings/ci_cd/_form.html.haml
View file @
7d3023e7
...
@@ -92,10 +92,10 @@
...
@@ -92,10 +92,10 @@
.form-check
.form-check
=
f
.
check_box
:forward_deployment_enabled
,
{
class:
'form-check-input'
}
=
f
.
check_box
:forward_deployment_enabled
,
{
class:
'form-check-input'
}
=
f
.
label
:forward_deployment_enabled
,
class:
'form-check-label'
do
=
f
.
label
:forward_deployment_enabled
,
class:
'form-check-label'
do
%strong
=
_
(
"Skip o
lder, pending
deployment jobs"
)
%strong
=
_
(
"Skip o
utdated
deployment jobs"
)
.form-text.text-muted
.form-text.text-muted
=
_
(
"When a deployment job is successful, skip older deployment jobs that are still pending"
)
=
_
(
"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-o
lder-pending
-deployment-jobs'
),
target:
'_blank'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/pipelines/settings'
,
anchor:
'skip-o
utdated
-deployment-jobs'
),
target:
'_blank'
%hr
%hr
.form-group
.form-group
...
...
changelogs/unreleased/docs-rename-skip-outdated-jobs.yml
0 → 100644
View file @
7d3023e7
---
title
:
Rename feature on the FE and locale
merge_request
:
author
:
type
:
changed
doc/ci/pipelines/settings.md
View file @
7d3023e7
...
@@ -192,7 +192,7 @@ you can enable this in the project settings:
...
@@ -192,7 +192,7 @@ you can enable this in the project settings:
1.
Check the
**Auto-cancel redundant, pending pipelines**
checkbox.
1.
Check the
**Auto-cancel redundant, pending pipelines**
checkbox.
1.
Click
**Save changes**
.
1.
Click
**Save changes**
.
## Skip o
lder, pending
deployment jobs
## Skip o
utdated
deployment jobs
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25276) in GitLab 12.9.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25276) in GitLab 12.9.
...
@@ -206,7 +206,7 @@ To avoid this scenario:
...
@@ -206,7 +206,7 @@ To avoid this scenario:
1.
Go to
**{settings}**
**Settings > CI / CD**
.
1.
Go to
**{settings}**
**Settings > CI / CD**
.
1.
Expand
**General pipelines**
.
1.
Expand
**General pipelines**
.
1.
Check the
**Skip o
lder, pending
deployment jobs**
checkbox.
1.
Check the
**Skip o
utdated
deployment jobs**
checkbox.
1.
Click
**Save changes**
.
1.
Click
**Save changes**
.
The pending deployment jobs will be skipped.
The pending deployment jobs will be skipped.
...
...
locale/gitlab.pot
View file @
7d3023e7
...
@@ -18323,7 +18323,7 @@ msgstr ""
...
@@ -18323,7 +18323,7 @@ msgstr ""
msgid "Size settings for static websites"
msgid "Size settings for static websites"
msgstr ""
msgstr ""
msgid "Skip o
lder, pending
deployment jobs"
msgid "Skip o
utdated
deployment jobs"
msgstr ""
msgstr ""
msgid "Skip this for now"
msgid "Skip this for now"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment