diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-18 01:05:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-18 01:05:11 +0000 |
| commit | 6fb20b10fdea0563680973b4fe0a7919779c2f76 (patch) | |
| tree | b1a67f0dfec96ab4ada3e5363317ce408269e46b /lib/api/groups.rb | |
| parent | d6c8a55189d62430c7ca4ffa6e5bb63f15a7efc1 (diff) | |
| parent | 6c190d273d18d21e50dea65645185839bf067714 (diff) | |
| download | gitlab-ce-6fb20b10fdea0563680973b4fe0a7919779c2f76.tar.gz | |
Merge branch 'sh-move-delete-groups-api-async' into 'master'
Move API group deletion to Sidekiq
See merge request gitlab-org/gitlab-ce!18626
Diffstat (limited to 'lib/api/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 0d125cd7831..03b6b30a0d8 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -167,8 +167,10 @@ module API Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/46285') destroy_conditionally!(group) do |group| - ::Groups::DestroyService.new(group, current_user).execute + ::Groups::DestroyService.new(group, current_user).async_execute end + + accepted! end desc 'Get a list of projects in this group.' do |