Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

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