diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-01 09:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-01 09:08:03 +0300 |
| commit | 8f535d9082bb0f10f2ef6b9133dbc77691ace4db (patch) | |
| tree | 5e8df6512d9c5a5fee8e499b10e5b0817799d4aa /app | |
| parent | 4346c3ae00a177d8afe73a898514b0edeb43e07d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/graphql_shared/possible_types.json | 1 | ||||
| -rw-r--r-- | app/workers/object_storage/delete_stale_direct_uploads_worker.rb | 2 |
2 files changed, 2 insertions, 1 deletions
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 |