summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-16 12:06:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-16 12:06:32 +0000
commitd2ffc30fd583e86d4122bb5061098f4f3ca7b3f1 (patch)
treecb29c77a3ea49eb8ec732b0e644ed6cfad4770d9 /app/models
parent914ea32e0efca21436220df2c10e1bfbe4ed3da9 (diff)
downloadgitlab-ce-d2ffc30fd583e86d4122bb5061098f4f3ca7b3f1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/container_repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 583e23d1274..253f74e9811 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -67,7 +67,7 @@ class ContainerRepository < ApplicationRecord
def delete_tags!
return unless has_tags?
- digests = tags.map { |tag| tag.digest }.to_set
+ digests = tags.map { |tag| tag.digest }.compact.to_set
digests.all? do |digest|
delete_tag_by_digest(digest)