diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 12:09:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 12:09:58 +0300 |
commit | a350f877c4246fee981690388239d1e19e17202a (patch) | |
tree | fc75efe26a34c732ab85b1dc6cf09fcab558e3f8 /lib/gitlab/time_tracking_formatter.rb | |
parent | 7adadf7e5b83c46f7e83051146624719e9b6bf0d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/time_tracking_formatter.rb')
-rw-r--r-- | lib/gitlab/time_tracking_formatter.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb index bfdfb01093f..67ecf498cf7 100644 --- a/lib/gitlab/time_tracking_formatter.rb +++ b/lib/gitlab/time_tracking_formatter.rb @@ -24,6 +24,12 @@ module Gitlab end def output(seconds) + seconds.to_i < 0 ? negative_output(seconds) : positive_output(seconds) + end + + private + + def positive_output(seconds) ChronicDuration.output( seconds, CUSTOM_DAY_AND_MONTH_LENGTH.merge( @@ -34,7 +40,9 @@ module Gitlab nil end - private + def negative_output(seconds) + "-" + positive_output(seconds.abs) + end def limit_to_hours_setting Gitlab::CurrentSettings.time_tracking_limit_to_hours |