Automatic merge of gitlab-org/gitlab master

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() {

app/assets/javascripts/projects/pipelines/charts/components/statistics_list.vue

 <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,
-        },
       ];
     },
   },

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
   }
 }

locale/gitlab.pot

@@ -20518,9 +20518,6 @@ msgstr ""
 msgid "PipelineCharts|There was an error parsing the data for the charts."
 msgstr ""
 
-msgid "PipelineCharts|Total duration:"
-msgstr ""
-
 msgid "PipelineCharts|Total:"
 msgstr ""
 

spec/frontend/projects/pipelines/charts/components/__snapshots__/statistics_list_spec.js.snap

@@ -38,14 +38,5 @@ exports[`StatisticsList displays the counts data with labels 1`] = `
       50.00%
     </strong>
   </li>
-  <li>
-    <span>
-      Total duration:
-    </span>
-     
-    <strong>
-      00:01:56
-    </strong>
-  </li>
 </ul>
 `;

spec/frontend/projects/pipelines/charts/components/app_spec.js

@@ -57,7 +57,6 @@ describe('ProjectsPipelinesChartsApp', () => {
         success: 23,
         total: 34,
         successRatio: 95.83333333333334,
-        totalDuration: 2471,
       });
     });
 

spec/models/application_setting_spec.rb

@@ -313,7 +313,7 @@ RSpec.describe ApplicationSetting do
 
     it { is_expected.to validate_presence_of(:max_attachment_size) }
 
-    it do
+    specify do
       is_expected.to validate_numericality_of(:max_attachment_size)
         .only_integer
         .is_greater_than(0)
@@ -321,13 +321,13 @@ RSpec.describe ApplicationSetting do
 
     it { is_expected.to validate_presence_of(:max_import_size) }
 
-    it do
+    specify do
       is_expected.to validate_numericality_of(:max_import_size)
         .only_integer
         .is_greater_than_or_equal_to(0)
     end
 
-    it do
+    specify do
       is_expected.to validate_numericality_of(:local_markdown_version)
         .only_integer
         .is_greater_than_or_equal_to(0)
@@ -472,7 +472,7 @@ RSpec.describe ApplicationSetting do
       end
 
       [:gitaly_timeout_default, :gitaly_timeout_medium, :gitaly_timeout_fast].each do |timeout_name|
-        it do
+        specify do
           is_expected.to validate_presence_of(timeout_name)
           is_expected.to validate_numericality_of(timeout_name).only_integer
             .is_greater_than_or_equal_to(0)
@@ -821,7 +821,7 @@ RSpec.describe ApplicationSetting do
       context 'validations' do
         it { is_expected.to validate_presence_of(:diff_max_patch_bytes) }
 
-        it do
+        specify do
           is_expected.to validate_numericality_of(:diff_max_patch_bytes)
           .only_integer
           .is_greater_than_or_equal_to(Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES)