Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 18:09:01 +0300
commitb304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch)
treea2f25dbea26c81e88b169c55a6275e3969323e82 /doc/development/pipelines.md
parentb84eeb256c4a780d902faee1f99ca9a711b3214a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/pipelines.md')
-rw-r--r--doc/development/pipelines.md8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 32b4c97cb62..29208c1bf76 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -253,7 +253,6 @@ graph RL;
E[review-build-cng];
F[build-qa-image];
G[review-deploy];
- G2["schedule:review-deploy<br/>(master only)"];
I["karma, jest, webpack-dev-server, static-analysis"];
I2["karma-foss, jest-foss<br/>(EE default refs only)"];
J["compile-assets pull-push-cache<br/>(master only)"];
@@ -297,19 +296,16 @@ subgraph "`post-test` stage"
subgraph "`review-prepare` stage"
E -.-> |needs| C;
- E2["schedule:review-build-cng<br/>(master schedule only)"] -.-> |needs| C;
end
subgraph "`review` stage"
- G --> |happens after| E
- G2 --> |happens after| E2
+ G -.-> |needs| E
end
subgraph "`qa` stage"
Q -.-> |needs| C;
Q -.-> |needs| F;
- QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs and depends on| G;
- QA2["schedule:review-performance<br/>(master only)"] -.-> |needs and depends on| G2;
+ QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs| G;
end
subgraph "`post-qa` stage"