Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 5 insertions, 4 deletions

diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
index f822e2c0874..4d7596e6e16 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue
@@ -148,12 +148,13 @@ export default {
 
         reportMessageToSentry(
           this.$options.name,
-          `| type: ${LOAD_FAILURE} , info: ${serializeLoadErrors(err)}`,
+          `| type: ${LOAD_FAILURE} , info: ${JSON.stringify(err)}`,
           {
+            graphViewType: this.graphViewType,
+            graphqlResourceEtag: this.graphqlResourceEtag,
+            metricsPath: this.metricsPath,
             projectPath: this.pipelineProjectPath,
             pipelineIid: this.pipelineIid,
-            pipelineStages: this.pipeline?.stages?.length || 0,
-            nbOfDownstreams: this.pipeline?.downstream?.length || 0,
           },
         );
       },
diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue
index 377f21b299f..4f2be27486c 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_item.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue
@@ -252,7 +252,7 @@ export default {
       @click="jobItemClick"
       @mouseout="hideTooltips"
     >
-      <div class="ci-job-name-component gl-display-flex gl-align-items-center">
+      <div class="gl-display-flex gl-align-items-center gl-flex-grow-1">
         <ci-icon :size="24" :status="job.status" class="gl-line-height-0" />
         <div class="gl-pl-3 gl-pr-3 gl-display-flex gl-flex-direction-column gl-pipeline-job-width">
           <div class="gl-text-truncate gl-pr-9 gl-line-height-normal">{{ job.name }}</div>