Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 16:36:43 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 16:36:43 +0300
commitb51fe6831123830f729295e16bd5aa99e3012c57 (patch)
treed3e3ece613ba01b7604d8ce6e7ae420e722af6f9 /lib
parent1cfdc7a63b2ebeffdd6f44310f42c83b78a6e7e6 (diff)
parente80d7a804f335447c8c4db8d8de3532957d80ec8 (diff)
Merge branch 'fix-delete-user-error' into 'master'
Fix error when deleting a user who has projects ### What does this MR do? This MR fixes an error that prevented users from being deleted in the Admin page if the user had personal projects. ### Why was this MR needed? Deleting a user who had projects would result in an error such as this: ``` Started DELETE "/admin/users/tdb1" for MYIP at 2015-06-22 20:53:02 +0100 Processing by Admin::UsersController#destroy as HTML Parameters: {"authenticity_token"=>"[FILTERED]", "id"=>"tdb1"} Completed 500 Internal Server Error in 30ms (ActiveRecord: 6.7ms) NameError (undefined local variable or method `current_user' for #<DeleteUserService:0x0000000cd01d38>): app/services/delete_user_service.rb:10:in `block in execute' app/services/delete_user_service.rb:7:in `execute' app/controllers/admin/users_controller.rb:89:in `destroy' ``` ### What are the relevant issue numbers? * Closes #1856 * Closes https://github.com/gitlabhq/gitlabhq/issues/9394 See merge request !868
Diffstat (limited to 'lib')
-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 7d4c68c7412..9b268cfe8bc 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -194,7 +194,7 @@ module API
user = User.find_by(id: params[:id])
if user
- DeleteUserService.new.execute(user)
+ DeleteUserService.new(current_user).execute(user)
else
not_found!('User')
end