Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index fbf76f2c36a..f0930705a3f 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -719,8 +719,8 @@ module Ci
         end
     end
 
-    def has_expiring_archive_artifacts?
-      has_expiring_artifacts? && artifacts_file&.exists?
+    def has_expiring_artifacts?
+      artifacts_expire_at.present? && artifacts_expire_at > Time.now
     end
 
     def keep_artifacts!
@@ -935,10 +935,6 @@ module Ci
         value.with_indifferent_access
       end
     end
-
-    def has_expiring_artifacts?
-      artifacts_expire_at.present? && artifacts_expire_at > Time.now
-    end
   end
 end