Revert to not using transactionjv-gitaly-unlink-repository

2 files changed, 6 insertions, 9 deletions

diff --git a/app/models/pool_repository.rb b/app/models/pool_repository.rb
index 16c3e8a53ed..7934118761e 100644
--- a/app/models/pool_repository.rb
+++ b/app/models/pool_repository.rb
@@ -82,9 +82,11 @@ class PoolRepository < ApplicationRecord
   end
 
   def mark_obsolete_if_last(repository)
-    return if member_projects.where.not(id: repository.project.id).exists?
-
-    mark_obsolete
+    if member_projects.where.not(id: repository.project.id).exists?
+      true
+    else
+      mark_obsolete
+    end
   end
 
   def object_pool
diff --git a/app/models/project.rb b/app/models/project.rb
index 46f944829ce..e2869fc2ad5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2128,12 +2128,7 @@ class Project < ApplicationRecord
   end
 
   def leave_pool_repository
-    return unless pool_repository
-
-    transaction do
-      pool_repository.mark_obsolete_if_last(repository)
-      update_column(:pool_repository_id, nil)
-    end
+    pool_repository&.mark_obsolete_if_last(repository) && update_column(:pool_repository_id, nil)
   end
 
   def link_pool_repository