1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2abb8e4be48..d2cf9058976 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -11,6 +11,7 @@ module Ci
     include Importable
     include Ci::HasRef
     include Ci::TrackEnvironmentUsage
+    include EachBatch
 
     extend ::Gitlab::Utils::Override
 
@@ -414,7 +415,7 @@ module Ci
     end
 
     def options_scheduled_at
-      ChronicDuration.parse(options[:start_in], use_complete_matcher: true)&.seconds&.from_now
+      ChronicDuration.parse(options[:start_in])&.seconds&.from_now
     end
 
     def action?
@@ -738,7 +739,7 @@ module Ci
     def artifacts_expire_in=(value)
       self.artifacts_expire_at =
         if value
-          ChronicDuration.parse(value, use_complete_matcher: true)&.seconds&.from_now
+          ChronicDuration.parse(value)&.seconds&.from_now
         end
     end
 
@@ -1090,7 +1091,7 @@ module Ci
     end
 
     def has_expiring_artifacts?
-      artifacts_expire_at.present? && artifacts_expire_at > Time.current
+      artifacts_expire_at.present? && artifacts_expire_at.future?
     end
 
     def job_jwt_variables