Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 154 insertions, 0 deletions

diff --git a/spec/frontend/pipelines/__snapshots__/utils_spec.js.snap b/spec/frontend/pipelines/__snapshots__/utils_spec.js.snap
index 99de0d2a3ef..52461885342 100644
--- a/spec/frontend/pipelines/__snapshots__/utils_spec.js.snap
+++ b/spec/frontend/pipelines/__snapshots__/utils_spec.js.snap
@@ -13,6 +13,7 @@ Array [
             "id": "6",
             "name": "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -53,6 +54,7 @@ Array [
             "id": "11",
             "name": "build_b",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -93,6 +95,7 @@ Array [
             "id": "16",
             "name": "build_c",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -133,6 +136,7 @@ Array [
             "id": "21",
             "name": "build_d 1/3",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -157,6 +161,7 @@ Array [
             "id": "24",
             "name": "build_d 2/3",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -181,6 +186,7 @@ Array [
             "id": "27",
             "name": "build_d 3/3",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -221,6 +227,7 @@ Array [
             "id": "59",
             "name": "test_c",
             "needs": Array [],
+            "previousStageJobsOrNeeds": Array [],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -267,6 +274,11 @@ Array [
               "build_b",
               "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
             ],
+            "previousStageJobsOrNeeds": Array [
+              "build_c",
+              "build_b",
+              "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
+            ],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -313,6 +325,13 @@ Array [
               "build_b",
               "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
             ],
+            "previousStageJobsOrNeeds": Array [
+              "build_d 3/3",
+              "build_d 2/3",
+              "build_d 1/3",
+              "build_b",
+              "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
+            ],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -343,6 +362,13 @@ Array [
               "build_b",
               "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
             ],
+            "previousStageJobsOrNeeds": Array [
+              "build_d 3/3",
+              "build_d 2/3",
+              "build_d 1/3",
+              "build_b",
+              "build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl",
+            ],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
@@ -385,6 +411,9 @@ Array [
             "needs": Array [
               "build_b",
             ],
+            "previousStageJobsOrNeeds": Array [
+              "build_b",
+            ],
             "scheduledAt": null,
             "status": Object {
               "__typename": "DetailedStatus",
diff --git a/spec/frontend/pipelines/graph/mock_data.js b/spec/frontend/pipelines/graph/mock_data.js
index dcbbde7bf36..41823bfdb9f 100644
--- a/spec/frontend/pipelines/graph/mock_data.js
+++ b/spec/frontend/pipelines/graph/mock_data.js
@@ -73,6 +73,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                       ],
                     },
@@ -118,6 +122,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                       ],
                     },
@@ -163,6 +171,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                       ],
                     },
@@ -208,6 +220,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                         {
                           __typename: 'CiJob',
@@ -235,6 +251,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                         {
                           __typename: 'CiJob',
@@ -262,6 +282,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                       ],
                     },
@@ -339,6 +363,27 @@ export const mockPipelineResponse = {
                               },
                             ],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '37',
+                                name: 'build_c',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '38',
+                                name: 'build_b',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '39',
+                                name:
+                                  'build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl',
+                              },
+                            ],
+                          },
                         },
                       ],
                     },
@@ -411,6 +456,37 @@ export const mockPipelineResponse = {
                               },
                             ],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '45',
+                                name: 'build_d 3/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '46',
+                                name: 'build_d 2/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '47',
+                                name: 'build_d 1/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '48',
+                                name: 'build_b',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '49',
+                                name:
+                                  'build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl',
+                              },
+                            ],
+                          },
                         },
                         {
                           __typename: 'CiJob',
@@ -465,6 +541,37 @@ export const mockPipelineResponse = {
                               },
                             ],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '52',
+                                name: 'build_d 3/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '53',
+                                name: 'build_d 2/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '54',
+                                name: 'build_d 1/3',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '55',
+                                name: 'build_b',
+                              },
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '56',
+                                name:
+                                  'build_a_nlfjkdnlvskfnksvjknlfdjvlvnjdkjdf_nvjkenjkrlngjeknjkl',
+                              },
+                            ],
+                          },
                         },
                       ],
                     },
@@ -503,6 +610,10 @@ export const mockPipelineResponse = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                         },
                       ],
                     },
@@ -547,6 +658,16 @@ export const mockPipelineResponse = {
                               },
                             ],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [
+                              {
+                                __typename: 'CiBuildNeed',
+                                id: '65',
+                                name: 'build_b',
+                              },
+                            ],
+                          },
                         },
                       ],
                     },
@@ -720,6 +841,10 @@ export const wrappedPipelineReturn = {
                             __typename: 'CiBuildNeedConnection',
                             nodes: [],
                           },
+                          previousStageJobsOrNeeds: {
+                            __typename: 'CiJobConnection',
+                            nodes: [],
+                          },
                           status: {
                             __typename: 'DetailedStatus',
                             id: '84',