diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 13:36:43 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 13:36:43 +0000 |
| commit | b51fe6831123830f729295e16bd5aa99e3012c57 (patch) | |
| tree | d3e3ece613ba01b7604d8ce6e7ae420e722af6f9 /CHANGELOG | |
| parent | 1cfdc7a63b2ebeffdd6f44310f42c83b78a6e7e6 (diff) | |
| parent | e80d7a804f335447c8c4db8d8de3532957d80ec8 (diff) | |
| download | gitlab-ce-b51fe6831123830f729295e16bd5aa99e3012c57.tar.gz | |
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 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 506f25684cb..43a4f0f2798 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) - Fix invalid timestamps in RSS feeds (Rowan Wookey) + - Fix error when deleting a user who has projects (Stan Hu) - Update maintenance documentation to explain no need to recompile asssets for omnibus installations (Stan Hu) - Support commenting on diffs in side-by-side mode (Stan Hu) - Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu) |