diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-29 17:43:11 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-09-15 14:47:08 -0700 |
| commit | 8cfdff180cd0fb5b6141ec8b2b7ad24294a735bd (patch) | |
| tree | 10ec10038e90dd1ce7e291a290c46576a51f32ef /app/services/groups/destroy_service.rb | |
| parent | e3a6ab4e6543db37769106e4a87bb214205358f3 (diff) | |
| download | gitlab-ce-mk-fix-orphaned-projects-on-9-2.tar.gz | |
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
Diffstat (limited to 'app/services/groups/destroy_service.rb')
| -rw-r--r-- | app/services/groups/destroy_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 497fdb09cdc..074be104700 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -1,8 +1,7 @@ module Groups class DestroyService < Groups::BaseService def async_execute - # Soft delete via paranoia gem - group.destroy + group.soft_delete_without_removing_associations job_id = GroupDestroyWorker.perform_async(group.id, current_user.id) Rails.logger.info("User #{current_user.id} scheduled a deletion of group ID #{group.id} with job ID #{job_id}") end |