diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-27 14:35:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-27 14:35:21 +0000 |
| commit | 1229ce06bd49dcd98b2df4d3358034021b74e0d3 (patch) | |
| tree | 0338da444d52331b06a293549199f09cad5d5eb9 /app | |
| parent | dfd15596a4b53ba2b7b3d0be9d5c17e2d7824c8f (diff) | |
| parent | 334591dd766ca31ab087475bfefbb5eb9dd1a0cf (diff) | |
| download | gitlab-ce-1229ce06bd49dcd98b2df4d3358034021b74e0d3.tar.gz | |
Merge branch 'sh-async-delete-children' into 'master'
Make nested groups deletion synchronous to avoid potential race
See merge request !9288
Diffstat (limited to 'app')
| -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! |