diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 14:40:25 +0200 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-13 11:05:26 +0100 |
| commit | fab1c4a81b7eef247abe6bdd3775cf0ce42badc1 (patch) | |
| tree | 983588103da2b534e6049d65114dcad5c85105b4 /app/models/ci/build.rb | |
| parent | 950d78f6d9ae43bf5c807d95326cf18afcfceedb (diff) | |
| download | gitlab-ce-fab1c4a81b7eef247abe6bdd3775cf0ce42badc1.tar.gz | |
Show the artifacts expiration prompt in Build Artifacts widget
Diffstat (limited to 'app/models/ci/build.rb')
| -rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 9f66ae63a55..80702b274dd 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -319,7 +319,7 @@ module Ci end def artifacts? - artifacts_file.exists? + !artifacts_expired? && artifacts_file.exists? end def artifacts_metadata? @@ -352,7 +352,7 @@ module Ci end def artifacts_expired? - !artifacts? && artifacts_expire_at && artifacts_expire_at < Time.now + artifacts_expire_at && artifacts_expire_at < Time.now end def artifacts_expire_in |