diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /app/services/ci/destroy_expired_job_artifacts_service.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/services/ci/destroy_expired_job_artifacts_service.rb')
| -rw-r--r-- | app/services/ci/destroy_expired_job_artifacts_service.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/ci/destroy_expired_job_artifacts_service.rb b/app/services/ci/destroy_expired_job_artifacts_service.rb index 7d2f5d33fed..5deb84812ac 100644 --- a/app/services/ci/destroy_expired_job_artifacts_service.rb +++ b/app/services/ci/destroy_expired_job_artifacts_service.rb @@ -28,7 +28,13 @@ module Ci private def destroy_batch - artifacts = Ci::JobArtifact.expired(BATCH_SIZE).to_a + artifact_batch = if Feature.enabled?(:keep_latest_artifact_for_ref) + Ci::JobArtifact.expired(BATCH_SIZE).unlocked + else + Ci::JobArtifact.expired(BATCH_SIZE) + end + + artifacts = artifact_batch.to_a return false if artifacts.empty? |