Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue
index 5fc0e220a72..dce8b020d6f 100644
--- a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue
+++ b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlButton, GlLink, GlProgressBar } from '@gitlab/ui';
 import { __ } from '~/locale';
-import { formatTime } from '~/lib/utils/datetime_utility';
+import { formatTime, secondsToMilliseconds } from '~/lib/utils/datetime_utility';
 import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
@@ -31,7 +31,7 @@ export default {
       return Math.round((this.report.success_count / this.report.total_count) * 100) || 0;
     },
     formattedDuration() {
-      return formatTime(this.report.total_time * 1000);
+      return formatTime(secondsToMilliseconds(this.report.total_time));
     },
     progressBarVariant() {
       if (this.successPercentage < 33) {
diff --git a/app/assets/javascripts/pipelines/stores/test_reports/utils.js b/app/assets/javascripts/pipelines/stores/test_reports/utils.js
index c426a5f0bb5..95466587d6b 100644
--- a/app/assets/javascripts/pipelines/stores/test_reports/utils.js
+++ b/app/assets/javascripts/pipelines/stores/test_reports/utils.js
@@ -1,5 +1,5 @@
 import { TestStatus } from '~/pipelines/constants';
-import { formatTime } from '~/lib/utils/datetime_utility';
+import { formatTime, secondsToMilliseconds } from '~/lib/utils/datetime_utility';
 
 function iconForTestStatus(status) {
   switch (status) {
@@ -12,7 +12,7 @@ function iconForTestStatus(status) {
   }
 }
 
-export const formattedTime = timeInSeconds => formatTime(timeInSeconds * 1000);
+export const formattedTime = timeInSeconds => formatTime(secondsToMilliseconds(timeInSeconds));
 
 export const addIconStatus = testCase => ({
   ...testCase,