Add latest changes from gitlab-org/gitlab@12-5-stable-ee

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/api/project_container_repositories.rb b/lib/api/project_container_repositories.rb
index 2a05974509a..2b33069e324 100644
--- a/lib/api/project_container_repositories.rb
+++ b/lib/api/project_container_repositories.rb
@@ -24,9 +24,11 @@ module API
       end
       get ':id/registry/repositories' do
         repositories = ContainerRepositoriesFinder.new(
-          id: user_project.id, container_type: :project
+          user: current_user, subject: user_project
         ).execute
 
+        track_event( 'list_repositories')
+
         present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags]
       end
 
@@ -40,6 +42,7 @@ module API
         authorize_admin_container_image!
 
         DeleteContainerRepositoryWorker.perform_async(current_user.id, repository.id)
+        track_event('delete_repository')
 
         status :accepted
       end
@@ -56,6 +59,8 @@ module API
         authorize_read_container_image!
 
         tags = Kaminari.paginate_array(repository.tags)
+        track_event('list_tags')
+
         present paginate(tags), with: Entities::ContainerRegistry::Tag
       end
 
@@ -77,6 +82,8 @@ module API
         CleanupContainerRepositoryWorker.perform_async(current_user.id, repository.id,
           declared_params.except(:repository_id))
 
+        track_event('delete_tag_bulk')
+
         status :accepted
       end
 
@@ -111,6 +118,8 @@ module API
           .execute(repository)
 
         if result[:status] == :success
+          track_event('delete_tag')
+
           status :ok
         else
           status :bad_request