diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-07 15:12:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-07 15:12:09 +0300 |
| commit | 43c3400c67f6470d4a19f143008990ee142dd828 (patch) | |
| tree | 2268d48d59023e8353c6ab55290e8031e224dacc /app/services/container_expiration_policies | |
| parent | bc935f05bc8d7dd89c3e7c88f90264e90b636e07 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/container_expiration_policies')
| -rw-r--r-- | app/services/container_expiration_policies/cleanup_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/container_expiration_policies/cleanup_service.rb b/app/services/container_expiration_policies/cleanup_service.rb index 52530b91578..0da5e552c48 100644 --- a/app/services/container_expiration_policies/cleanup_service.rb +++ b/app/services/container_expiration_policies/cleanup_service.rb @@ -24,8 +24,8 @@ module ContainerExpirationPolicies begin service_result = Projects::ContainerRepository::CleanupTagsService - .new(project, nil, policy_params.merge('container_expiration_policy' => true)) - .execute(repository) + .new(repository, nil, policy_params.merge('container_expiration_policy' => true)) + .execute rescue StandardError repository.cleanup_unfinished! |