Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

3 files changed, 14 insertions, 82 deletions

diff --git a/app/assets/javascripts/pipelines/graphql/fragments/linked_pipelines.fragment.graphql b/app/assets/javascripts/pipelines/graphql/fragments/linked_pipelines.fragment.graphql
deleted file mode 100644
index 3bf6d8dc9d8..00000000000
--- a/app/assets/javascripts/pipelines/graphql/fragments/linked_pipelines.fragment.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-fragment LinkedPipelineData on Pipeline {
-  id
-  iid
-  path
-  status: detailedStatus {
-    group
-    label
-    icon
-  }
-  sourceJob {
-    name
-  }
-  project {
-    name
-    fullPath
-  }
-}
diff --git a/app/assets/javascripts/pipelines/graphql/queries/pipeline_stages_connection.fragment.graphql b/app/assets/javascripts/pipelines/graphql/fragments/pipeline_stages_connection.fragment.graphql
index 1da4fa0a72b..f93908aeb04 100644
--- a/app/assets/javascripts/pipelines/graphql/queries/pipeline_stages_connection.fragment.graphql
+++ b/app/assets/javascripts/pipelines/graphql/fragments/pipeline_stages_connection.fragment.graphql
@@ -4,9 +4,23 @@ fragment PipelineStagesConnection on CiConfigStageConnection {
     groups {
       nodes {
         name
+        size
         jobs {
           nodes {
             name
+            script
+            beforeScript
+            afterScript
+            environment
+            allowFailure
+            tags
+            when
+            only {
+              refs
+            }
+            except {
+              refs
+            }
             needs {
               nodes {
                 name
diff --git a/app/assets/javascripts/pipelines/graphql/queries/get_pipeline_details.query.graphql b/app/assets/javascripts/pipelines/graphql/queries/get_pipeline_details.query.graphql
deleted file mode 100644
index 25aede49631..00000000000
--- a/app/assets/javascripts/pipelines/graphql/queries/get_pipeline_details.query.graphql
+++ /dev/null
@@ -1,65 +0,0 @@
-#import "../fragments/linked_pipelines.fragment.graphql"
-
-query getPipelineDetails($projectPath: ID!, $iid: ID!) {
-  project(fullPath: $projectPath) {
-    pipeline(iid: $iid) {
-      id
-      iid
-      downstream {
-        nodes {
-          ...LinkedPipelineData
-        }
-      }
-      upstream {
-        ...LinkedPipelineData
-      }
-      stages {
-        nodes {
-          name
-          status: detailedStatus {
-            action {
-              icon
-              path
-              title
-            }
-          }
-          groups {
-            nodes {
-              status: detailedStatus {
-                label
-                group
-                icon
-              }
-              name
-              size
-              jobs {
-                nodes {
-                  name
-                  scheduledAt
-                  needs {
-                    nodes {
-                      name
-                    }
-                  }
-                  status: detailedStatus {
-                    icon
-                    tooltip
-                    hasDetails
-                    detailsPath
-                    group
-                    action {
-                      buttonTitle
-                      icon
-                      path
-                      title
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}