From 8f535d9082bb0f10f2ef6b9133dbc77691ace4db Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 1 Jun 2023 06:08:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/graphql_shared/possible_types.json | 1 + app/workers/object_storage/delete_stale_direct_uploads_worker.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index f35886716ee..c7a446b36f8 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -94,6 +94,7 @@ "ContainerRepositoryRegistry", "DependencyProxyBlobRegistry", "DependencyProxyManifestRegistry", + "DesignManagementRepositoryRegistry", "JobArtifactRegistry", "LfsObjectRegistry", "MergeRequestDiffRegistry", diff --git a/app/workers/object_storage/delete_stale_direct_uploads_worker.rb b/app/workers/object_storage/delete_stale_direct_uploads_worker.rb index 216df498cc2..081b58ca726 100644 --- a/app/workers/object_storage/delete_stale_direct_uploads_worker.rb +++ b/app/workers/object_storage/delete_stale_direct_uploads_worker.rb @@ -22,7 +22,7 @@ module ObjectStorage result = ObjectStorage::DeleteStaleDirectUploadsService.new.execute log_extra_metadata_on_done(:total_pending_entries, result[:total_pending_entries]) - log_extra_metadata_on_done(:total_stale_entries, result[:total_stale_entries]) + log_extra_metadata_on_done(:total_deleted_stale_entries, result[:total_deleted_stale_entries]) log_extra_metadata_on_done(:execution_timeout, result[:execution_timeout]) end end -- cgit v1.2.3