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
d33513a8
Commit
d33513a8
authored
Feb 27, 2020
by
Etienne Baqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated documentation based on review
parent
42a9c143
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
14 deletions
+20
-14
app/views/projects/settings/ci_cd/_form.html.haml
app/views/projects/settings/ci_cd/_form.html.haml
+3
-3
doc/user/project/pipelines/settings.md
doc/user/project/pipelines/settings.md
+13
-7
locale/gitlab.pot
locale/gitlab.pot
+4
-4
No files found.
app/views/projects/settings/ci_cd/_form.html.haml
View file @
d33513a8
...
@@ -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
=
_
(
"
Drop older active deployment
s"
)
%strong
=
_
(
"
Skip older, pending deployment job
s"
)
.form-text.text-muted
.form-text.text-muted
=
_
(
"When a deployment
is successful, allow older but still pending deployment(s) to be skipped
"
)
=
_
(
"When a deployment
job is successful, skip older deployment jobs that are still pending
"
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/pipelines/settings'
,
anchor:
'
drop-older-active-deployment
s'
),
target:
'_blank'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/pipelines/settings'
,
anchor:
'
skip-older-pending-deployment-job
s'
),
target:
'_blank'
%hr
%hr
.form-group
.form-group
...
...
doc/user/project/pipelines/settings.md
View file @
d33513a8
...
@@ -191,18 +191,24 @@ you can enable this in the project settings:
...
@@ -191,18 +191,24 @@ 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**
.
##
Drop older active deployment
s
##
Skip older, pending deployment job
s
> [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.
The number of pipelines running for your project can be important enough so that
Your project may have multiple concurrent deployment jobs that are
concurrent deployment jobs are
scheduled to run within the same time frame.
scheduled to run within the same time frame.
This can lead to a situation where an older deployment job
can be run
after a
This can lead to a situation where an older deployment job
runs
after a
newer one, which may not be
a desired situation
.
newer one, which may not be
what you want
.
To avoid such scenario, check the
**Drop older active deployments**
To avoid this scenario:
checkbox and save the changes.
1.
Go to
**{settings}**
**Settings > CI / CD**
.
1.
Expand
**General pipelines**
.
1.
Check the
**Skip older, pending deployment jobs**
checkbox.
1.
Click
**Save changes**
.
The pending deployment jobs will be skipped.
## Pipeline Badges
## Pipeline Badges
...
...
locale/gitlab.pot
View file @
d33513a8
...
@@ -7013,9 +7013,6 @@ msgstr ""
...
@@ -7013,9 +7013,6 @@ msgstr ""
msgid "Downvotes"
msgid "Downvotes"
msgstr ""
msgstr ""
msgid "Drop older active deployments"
msgstr ""
msgid "Due date"
msgid "Due date"
msgstr ""
msgstr ""
...
@@ -17911,6 +17908,9 @@ msgstr ""
...
@@ -17911,6 +17908,9 @@ msgstr ""
msgid "Size settings for static websites"
msgid "Size settings for static websites"
msgstr ""
msgstr ""
msgid "Skip older, pending deployment jobs"
msgstr ""
msgid "Skip this for now"
msgid "Skip this for now"
msgstr ""
msgstr ""
...
@@ -22046,7 +22046,7 @@ msgstr ""
...
@@ -22046,7 +22046,7 @@ msgstr ""
msgid "What are you searching for?"
msgid "What are you searching for?"
msgstr ""
msgstr ""
msgid "When a deployment
is successful, allow older but still pending deployment(s) to be skipped
"
msgid "When a deployment
job is successful, skip older deployment jobs that are still pending
"
msgstr ""
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects"
msgid "When a runner is locked, it cannot be assigned to other projects"
...
...
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