summaryrefslogtreecommitdiff
path: root/doc/development/pipelines.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 12:06:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 12:06:04 +0000
commit81c6c53d6cd5ffde1c070d987dc2985f662cb301 (patch)
tree97ddbeb02373e8134edaa3e045f74d41d66cd500 /doc/development/pipelines.md
parentf7e0be9bbe1173b0de18a52a21b49d19349f40b7 (diff)
downloadgitlab-ce-81c6c53d6cd5ffde1c070d987dc2985f662cb301.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/pipelines.md')
-rw-r--r--doc/development/pipelines.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 8710774bbb1..9d065406c90 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -185,11 +185,11 @@ subgraph "`qa` stage"
R --> |needs| F;
P --> |needs| B;
P --> |needs| F;
- review-qa-smoke -.-> |depends on| G;
- review-qa-all -.-> |depends on| G;
- review-qa-performance -.-> |depends on| G;
- X2["schedule:review-performance<br/>(master only)"] -.-> |depends on| G2;
- dast -.-> |depends on| G;
+ review-qa-smoke -.-> |needs and depends on| G;
+ review-qa-all -.-> |needs and depends on| G;
+ review-performance -.-> |needs and depends on| G;
+ X2["schedule:review-performance<br/>(master only)"] -.-> |needs and depends on| G2;
+ dast -.-> |needs and depends on| G;
end
subgraph "`notification` stage"