diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
| commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
| tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /app/services/groups/destroy_service.rb | |
| parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
| parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) | |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
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 e3f9d9ee95d..58e88688dfa 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -1,7 +1,6 @@ module Groups class DestroyService < Groups::BaseService def async_execute - 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 @@ -23,7 +22,7 @@ module Groups group.chat_team&.remove_mattermost_team(current_user) - group.really_destroy! + group.destroy end end end |