diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-16 10:11:37 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-16 10:11:37 +0000 |
| commit | a55dc72f1a1c04aa9ce099cb3ced2eaa485a1f2d (patch) | |
| tree | 3179062f5da1f147d319eb79b74ff04084b0c6a0 /app | |
| parent | fcd09b77bcb1e12f8649841a84853a4080d72950 (diff) | |
| parent | fdc602e40e6593acee41fbd2c819de77aac37651 (diff) | |
| download | gitlab-ce-a55dc72f1a1c04aa9ce099cb3ced2eaa485a1f2d.tar.gz | |
Merge branch 'downloading-expired-artifacts' into 'master'
Don't render artifact download links for builds with expired artifacts
See merge request gitlab-org/gitlab-ce!26753
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index b81a3cf8362..0b1f119686a 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -686,7 +686,7 @@ module Ci # We purposely cast the builds to an Array here. Because we always use the # rows if there are more than 0 this prevents us from having to run two # queries: one to get the count and one to get the rows. - @latest_builds_with_artifacts ||= builds.latest.with_artifacts_archive.to_a + @latest_builds_with_artifacts ||= builds.latest.with_artifacts_not_expired.to_a end def has_test_reports? |