summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-10-18 16:35:37 -0700
committerStan Hu <stanhu@gmail.com>2017-10-18 19:38:12 -0700
commitb7e3503372e0043ed6e0185b6546043457173bc8 (patch)
tree98e0357162b52171ae6fd27d1cc6e21058edf2d0 /app/serializers
parent9c71fb0de2f0a7482b1a59c673142981ecdab26f (diff)
downloadgitlab-ce-b7e3503372e0043ed6e0185b6546043457173bc8.tar.gz
Fix inability to delete container registry tags
Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/container_tag_entity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/container_tag_entity.rb b/app/serializers/container_tag_entity.rb
index 26a68c43807..8f1488e6cbb 100644
--- a/app/serializers/container_tag_entity.rb
+++ b/app/serializers/container_tag_entity.rb
@@ -4,7 +4,7 @@ class ContainerTagEntity < Grape::Entity
expose :name, :location, :revision, :short_revision, :total_size, :created_at
expose :destroy_path, if: -> (*) { can_destroy? } do |tag|
- project_registry_repository_tag_path(project, tag.repository, tag.name, format: :json)
+ project_registry_repository_tag_path(project, tag.repository, tag.name)
end
private