diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:04:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:04:43 +0000 |
| commit | 4d64524b0dc26dadc58a01a1696d2198a05e21ee (patch) | |
| tree | 930429bd79aee23ea3199c9fd146b83551ebdec4 /lib/api/users.rb | |
| parent | 9f5537304bf30bbe7430cc0290df3acea035a428 (diff) | |
| parent | cca61980d5ad9c4db65b9498fe49d936657bc0e2 (diff) | |
| download | gitlab-ce-4d64524b0dc26dadc58a01a1696d2198a05e21ee.tar.gz | |
Merge branch 'query-counts' into 'master'
Track and act upon the number of executed SQL queries
See merge request gitlab-org/gitlab-ce!16466
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index e5de31ad51b..c7c2aa280d5 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -383,6 +383,8 @@ module API optional :hard_delete, type: Boolean, desc: "Whether to remove a user's contributions" end delete ":id" do + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42279') + authenticated_as_admin! user = User.find_by(id: params[:id]) |