summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/boards
diff options
context:
space:
mode:
authorJon Kolb <kolbyjack@gmail.com>2019-06-11 17:48:42 +0800
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-06-25 09:31:23 +0800
commit4e283ee706b11fd3b918230976addc9a70603ce6 (patch)
tree17c39d55c76ce24380f4805c733c823b63222d85 /app/assets/javascripts/boards
parentdb9783f7826ed5ba58a8941dd80a1cd7dda517b0 (diff)
downloadgitlab-ce-4e283ee706b11fd3b918230976addc9a70603ce6.tar.gz
Limit time tracking values to hours
Adds an instance setting to limit display of time tracking values to hours only
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r--app/assets/javascripts/boards/components/issue_time_estimate.vue9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/issue_time_estimate.vue b/app/assets/javascripts/boards/components/issue_time_estimate.vue
index 98c1d29db16..2545980163f 100644
--- a/app/assets/javascripts/boards/components/issue_time_estimate.vue
+++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue
@@ -16,10 +16,15 @@ export default {
},
computed: {
title() {
- return stringifyTime(parseSeconds(this.estimate), true);
+ return stringifyTime(
+ parseSeconds(this.estimate, { limitToHours: gon.time_tracking_display_hours_only }),
+ true
+ );
},
timeEstimate() {
- return stringifyTime(parseSeconds(this.estimate));
+ return stringifyTime(
+ parseSeconds(this.estimate, { limitToHours: gon.time_tracking_display_hours_only })
+ );
},
},
};