Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d1edf3e9c03..0bff49f3bb3 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -763,8 +763,8 @@ module Ci
         end
     end
 
-    def has_expiring_artifacts?
-      artifacts_expire_at.present? && artifacts_expire_at > Time.now
+    def has_expiring_archive_artifacts?
+      has_expiring_artifacts? && job_artifacts_archive.present?
     end
 
     def keep_artifacts!
@@ -979,6 +979,10 @@ module Ci
         value.with_indifferent_access
       end
     end
+
+    def has_expiring_artifacts?
+      artifacts_expire_at.present? && artifacts_expire_at > Time.now
+    end
   end
 end