diff options
| author | Jon Kolb <kolbyjack@gmail.com> | 2019-06-11 17:48:42 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-25 09:31:23 +0800 |
| commit | 4e283ee706b11fd3b918230976addc9a70603ce6 (patch) | |
| tree | 17c39d55c76ce24380f4805c733c823b63222d85 /lib/gitlab/time_tracking_formatter.rb | |
| parent | db9783f7826ed5ba58a8941dd80a1cd7dda517b0 (diff) | |
| download | gitlab-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 'lib/gitlab/time_tracking_formatter.rb')
| -rw-r--r-- | lib/gitlab/time_tracking_formatter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb index cc206010e74..a63fe51eb97 100644 --- a/lib/gitlab/time_tracking_formatter.rb +++ b/lib/gitlab/time_tracking_formatter.rb @@ -16,7 +16,8 @@ module Gitlab def output(seconds) with_custom_config do - ChronicDuration.output(seconds, format: :short, limit_to_hours: false, weeks: true) rescue nil + limit_to_hours = Gitlab::CurrentSettings.time_tracking_display_hours_only + ChronicDuration.output(seconds, format: :short, limit_to_hours: limit_to_hours, weeks: true) rescue nil end end |