Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'mk-fix-orphaned-projects-on-9-2

Defer project destroys within a namespace in Groups::DestroyService#async_execute

See merge request !12435

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index d6b0ab0e52c..7fb1ae187da 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -224,6 +224,12 @@ class Namespace < ActiveRecord::Base
     parent.present?
   end
 
+  def soft_delete_without_removing_associations
+    # We can't use paranoia's `#destroy` since this will hard-delete projects.
+    # Project uses `pending_delete` instead of the acts_as_paranoia gem.
+    self.deleted_at = Time.now
+  end
+
   private
 
   def repository_storage_paths