Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 15 deletions

diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
index 24d5b14ded9..65ecd5be05d 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
@@ -1,6 +1,5 @@
 <script>
 import { __, sprintf } from '~/locale';
-import { abbreviateTime } from '~/lib/utils/datetime_utility';
 import icon from '~/vue_shared/components/icon.vue';
 import tooltip from '~/vue_shared/directives/tooltip';
 
@@ -41,12 +40,6 @@ export default {
     },
   },
   computed: {
-    timeSpent() {
-      return this.abbreviateTime(this.timeSpentHumanReadable);
-    },
-    timeEstimate() {
-      return this.abbreviateTime(this.timeEstimateHumanReadable);
-    },
     divClass() {
       if (this.showComparisonState) {
         return 'compare';
@@ -73,11 +66,11 @@ export default {
     },
     text() {
       if (this.showComparisonState) {
-        return `${this.timeSpent} / ${this.timeEstimate}`;
+        return `${this.timeSpentHumanReadable} / ${this.timeEstimateHumanReadable}`;
       } else if (this.showEstimateOnlyState) {
-        return `-- / ${this.timeEstimate}`;
+        return `-- / ${this.timeEstimateHumanReadable}`;
       } else if (this.showSpentOnlyState) {
-        return `${this.timeSpent} / --`;
+        return `${this.timeSpentHumanReadable} / --`;
       } else if (this.showNoTimeTrackingState) {
         return __('None');
       }
@@ -100,11 +93,6 @@ export default {
       return this.showNoTimeTrackingState ? __('Time tracking') : this.timeTrackedTooltipText;
     },
   },
-  methods: {
-    abbreviateTime(timeStr) {
-      return abbreviateTime(timeStr);
-    },
-  },
 };
 </script>