diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-05-11 14:45:18 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-05-16 08:58:07 +0200 |
| commit | 2060533f91b5527b568321f63a1aa7f4ef0081d5 (patch) | |
| tree | 31712ab032c6b3e57a49b7be2dfe2fcc97713f1e | |
| parent | 8c0166f2b96e233cbf8ec84e4314094521dc0316 (diff) | |
| download | gitlab-ce-jprovazn-remote-upload-destroy.tar.gz | |
Whitelisted query limits for group destroy APIjprovazn-remote-upload-destroy
| -rw-r--r-- | lib/api/groups.rb | 1 | ||||
| -rw-r--r-- | lib/api/v3/groups.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 92e3d5cc10a..0d125cd7831 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -165,6 +165,7 @@ module API group = find_group!(params[:id]) authorize! :admin_group, group + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/46285') destroy_conditionally!(group) do |group| ::Groups::DestroyService.new(group, current_user).execute end diff --git a/lib/api/v3/groups.rb b/lib/api/v3/groups.rb index 2c52d21fa1c..3844fd4810d 100644 --- a/lib/api/v3/groups.rb +++ b/lib/api/v3/groups.rb @@ -131,6 +131,7 @@ module API delete ":id" do group = find_group!(params[:id]) authorize! :admin_group, group + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/46285') present ::Groups::DestroyService.new(group, current_user).execute, with: Entities::GroupDetail, current_user: current_user end |