1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb
index 7094db14c5d..26efb3b918d 100644
--- a/lib/gitlab/time_tracking_formatter.rb
+++ b/lib/gitlab/time_tracking_formatter.rb
@@ -8,6 +8,8 @@ module Gitlab
     CUSTOM_DAY_AND_MONTH_LENGTH = { hours_per_day: 8, days_per_month: 20 }.freeze
 
     def parse(string, keep_zero: false)
+      return unless string
+
       negative_time = string.start_with?('-')
       string = string.delete_prefix('-')
 
@@ -15,7 +17,10 @@ module Gitlab
         begin
           ChronicDuration.parse(
             string,
-            CUSTOM_DAY_AND_MONTH_LENGTH.merge(default_unit: 'hours', keep_zero: keep_zero))
+            CUSTOM_DAY_AND_MONTH_LENGTH.merge(
+              default_unit: 'hours', keep_zero: keep_zero,
+              use_complete_matcher: true
+            ))
         rescue StandardError
           nil
         end