summaryrefslogtreecommitdiff
path: root/lib/api/users.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-22 21:08:19 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-22 21:08:19 +0200
commit4742dba4c555dc9acc232c31e1066736943ef9fd (patch)
treefcf1ba6e870751e5bfaa7fbc393c5b0e47867ad3 /lib/api/users.rb
parentbf15b56a1ee8596189a5617d26059c5c32eac63e (diff)
parent4d56c359d343ba3a1117dfc06034820a415450d3 (diff)
downloadgitlab-ce-4742dba4c555dc9acc232c31e1066736943ef9fd.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r--lib/api/users.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 89ec2c61a86..ae808b6272b 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -119,7 +119,7 @@ module API
# DELETE /users/:id
delete ":id" do
authenticated_as_admin!
- user = User.find_by_id(params[:id])
+ user = User.find_by(id: params[:id])
if user
user.destroy