Merge branch 'sh-fix-broken-docker-delete' into 'master'

Fix inability to delete container registry tags

Closes #39260

See merge request gitlab-org/gitlab-ce!14947

app/assets/javascripts/registry/components/collapsible_container.vue

@@ -57,7 +57,7 @@
       },
 
       showError(message) {
-        Flash((errorMessages[message]));
+        Flash(errorMessages[message]);
       },
     },
   };

app/assets/javascripts/registry/components/table_registry.vue

@@ -57,7 +57,7 @@
       },
 
       showError(message) {
-        Flash((errorMessages[message]));
+        Flash(errorMessages[message]);
       },
     },
   };

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

config/routes/project.rb

@@ -281,10 +281,15 @@ constraints(ProjectUrlConstrainer.new) do
 
       namespace :registry do
         resources :repository, only: [] do
+          # We default to JSON format in the controller to avoid ambiguity.
+          # `latest.json` could either be a request for a tag named `latest`
+          # in JSON format, or a request for tag named `latest.json`.
+          scope format: false do
             resources :tags, only: [:index, :destroy],
                              constraints: { id: Gitlab::Regex.container_registry_tag_regex }
           end
         end
+      end
 
       resources :milestones, constraints: { id: /\d+/ } do
         member do