Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 16 deletions

diff --git a/app/assets/javascripts/projects/pipelines/charts/components/app.vue b/app/assets/javascripts/projects/pipelines/charts/components/app.vue
index 116da641783..4d48468ce88 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/app.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/app.vue
@@ -136,19 +136,13 @@ export default {
       return failedCount === 0 ? 100 : ratio;
     },
     formattedCounts() {
-      const {
-        totalPipelines,
-        successfulPipelines,
-        failedPipelines,
-        totalPipelineDuration,
-      } = this.counts;
+      const { totalPipelines, successfulPipelines, failedPipelines } = this.counts;
 
       return {
         total: totalPipelines?.count,
         success: successfulPipelines?.count,
         failed: failedPipelines?.count,
         successRatio: this.successRatio,
-        totalDuration: totalPipelineDuration,
       };
     },
     areaCharts() {
diff --git a/app/assets/javascripts/projects/pipelines/charts/components/statistics_list.vue b/app/assets/javascripts/projects/pipelines/charts/components/statistics_list.vue
index 94cecd2e479..7bc3b787f75 100644
--- a/app/assets/javascripts/projects/pipelines/charts/components/statistics_list.vue
+++ b/app/assets/javascripts/projects/pipelines/charts/components/statistics_list.vue
@@ -1,5 +1,4 @@
 <script>
-import { formatTime } from '~/lib/utils/datetime_utility';
 import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format';
 import { s__, n__ } from '~/locale';
 
@@ -13,9 +12,6 @@ export default {
     },
   },
   computed: {
-    totalDuration() {
-      return formatTime(this.counts.totalDuration);
-    },
     statistics() {
       const formatter = getFormatter(SUPPORTED_FORMATS.percentHundred);
 
@@ -36,10 +32,6 @@ export default {
           title: s__('PipelineCharts|Success ratio:'),
           value: formatter(this.counts.successRatio, defaultPrecision),
         },
-        {
-          title: s__('PipelineCharts|Total duration:'),
-          value: this.totalDuration,
-        },
       ];
     },
   },
diff --git a/app/assets/javascripts/projects/pipelines/charts/graphql/queries/get_pipeline_count_by_status.query.graphql b/app/assets/javascripts/projects/pipelines/charts/graphql/queries/get_pipeline_count_by_status.query.graphql
index eb0dbf8dd16..d68df689f5f 100644
--- a/app/assets/javascripts/projects/pipelines/charts/graphql/queries/get_pipeline_count_by_status.query.graphql
+++ b/app/assets/javascripts/projects/pipelines/charts/graphql/queries/get_pipeline_count_by_status.query.graphql
@@ -9,6 +9,5 @@ query getPipelineCountByStatus($projectPath: ID!) {
     failedPipelines: pipelines(status: FAILED) {
       count
     }
-    totalPipelineDuration
   }
 }