Fix CI tests

2 files changed, 4 insertions, 2 deletions

diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 8e2e46346ca..0ff2bc3cb81 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -64,7 +64,9 @@ module Projects
     end
 
     def remove_registry_tags
-      project.image_registry.delete_tags
+      return unless Gitlab.config.registry.enabled
+
+      project.container_registry_repository.delete_tags
     end
 
     def raise_error(message)
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 0d72286dec7..03b57dea51e 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -36,7 +36,7 @@ module Projects
 
         if project.has_container_registry_tags?
           # we currently doesn't support renaming repository if it contains tags in container registry
-          raise TransferError.new('Repository cannot be renamed, due to tags in container registry')
+          raise TransferError.new('Project cannot be transferred, because tags are present in its container registry')
         end
 
         project.expire_caches_before_rename(old_path)