summaryrefslogtreecommitdiff
path: root/app/services/projects/container_repository/cleanup_tags_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 17:33:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 17:33:30 +0000
commit5049b3cd2362d119d0f6147bb45b449609b07cb4 (patch)
tree69c89f0b19c09d3600ab3772be20209d4d702d36 /app/services/projects/container_repository/cleanup_tags_service.rb
parentd5cc1255b64367c04f208150dbafa0be7b50dc45 (diff)
downloadgitlab-ce-5049b3cd2362d119d0f6147bb45b449609b07cb4.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/services/projects/container_repository/cleanup_tags_service.rb')
-rw-r--r--app/services/projects/container_repository/cleanup_tags_service.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/projects/container_repository/cleanup_tags_service.rb b/app/services/projects/container_repository/cleanup_tags_service.rb
index 204a54ff23a..31500043544 100644
--- a/app/services/projects/container_repository/cleanup_tags_service.rb
+++ b/app/services/projects/container_repository/cleanup_tags_service.rb
@@ -25,7 +25,10 @@ module Projects
tag_names = tags.map(&:name)
Projects::ContainerRepository::DeleteTagsService
- .new(container_repository.project, current_user, tags: tag_names)
+ .new(container_repository.project,
+ current_user,
+ tags: tag_names,
+ container_expiration_policy: params['container_expiration_policy'])
.execute(container_repository)
end