diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-06 19:08:06 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-06 19:08:06 +0300 |
| commit | 5db5a9cbd1192d776874a92e0a253c605f3c4417 (patch) | |
| tree | 67be95609ce038ec9c2fbdc45fb491bb223c7137 /lib/api/users.rb | |
| parent | a29f0c28fd07ba14f0d0e5fb9c878a2eb117e388 (diff) | |
| parent | ba62493009c2360018709b660956a6173f3e1515 (diff) | |
Merge branch 'master' into 'zj-wiki-page-versions'
# Conflicts:
# Gemfile
# Gemfile.lock
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]) |