Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 5 deletions

diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 302e2a2a6ee..a38d58f604e 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -136,17 +136,23 @@ graph RL;
   E[review-build-cng];
   F[build-qa-image];
   G[review-deploy];
-  I["karma, jest, webpack-dev-server, static-analysis"];
+  I["karma, jest"];
   I2["karma-as-if-foss, jest-as-if-foss<br/>(EE default refs only)"];
   J["compile-assets pull-push-cache<br/>(master only)"];
   J2["compile-assets pull-push-cache as-if-foss<br/>(EE master only)"];
   K[compile-assets pull-cache];
   K2["compile-assets pull-cache as-if-foss<br/>(EE default refs only)"];
+  U[frontend-fixtures];
+  U2["frontend-fixtures-as-if-foss<br/>(EE default refs only)"];
+  V["webpack-dev-server, static-analysis"];
   M[coverage];
   N["pages (master only)"];
   Q[package-and-qa];
   S["RSpec<br/>(e.g. rspec unit pg9)"]
   T[retrieve-tests-metadata];
+  QA["qa:internal, qa:selectors"];
+  QA2["qa:internal-as-if-foss, qa:selectors-as-if-foss<br/>(EE default refs only)"];
+  X["docs lint, code_quality, sast, dependency_scanning, danger-review"];
 
 subgraph "`prepare` stage"
     A
@@ -160,17 +166,26 @@ subgraph "`prepare` stage"
     T
     end
 
+subgraph "`fixture` stage"
+    U -.-> |needs and depends on| A;
+    U -.-> |needs and depends on| K;
+    U2 -.-> |needs and depends on| A;
+    U2 -.-> |needs and depends on| K2;
+    end
+
 subgraph "`test` stage"
     D -.-> |needs| A;
-    I -.-> |needs and depends on| A;
-    I -.-> |needs and depends on| K;
-    I2 -.-> |needs and depends on| A;
-    I2 -.-> |needs and depends on| K;
+    I -.-> |needs and depends on| U;
+    I2 -.-> |needs and depends on| U2;
     L -.-> |needs and depends on| A;
     S -.-> |needs and depends on| A;
     S -.-> |needs and depends on| K;
     S -.-> |needs and depends on| T;
     L["db:*, gitlab:setup, graphql-docs-verify, downtime_check"] -.-> |needs| A;
+    V -.-> |needs and depends on| K;
+    X -.-> |needs| T;
+    QA -.-> |needs| T;
+    QA2 -.-> |needs| T;
     end
 
 subgraph "`post-test` stage"