diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
| commit | ddfd09c09cb904529df567e5606d76c467ed856f (patch) | |
| tree | d17a48cf08e580cac866417700ea1ffe74c48bd7 /app/services/groups | |
| parent | 52c4a7866ed010d8db67e5ca976d8c73d4084784 (diff) | |
| parent | 3b3f0fab452fb9cbe4fbe7f75112bef3a7f9d039 (diff) | |
| download | gitlab-ce-ddfd09c09cb904529df567e5606d76c467ed856f.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'app/services/groups')
| -rw-r--r-- | app/services/groups/destroy_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 2e2d7f884ac..497fdb09cdc 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -18,7 +18,8 @@ module Groups end group.children.each do |group| - DestroyService.new(group, current_user).async_execute + # This needs to be synchronous since the namespace gets destroyed below + DestroyService.new(group, current_user).execute end group.really_destroy! |