diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-18 15:10:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-18 15:10:08 +0000 |
| commit | aa47d99bdda5a460346db1970ced0da169036de4 (patch) | |
| tree | d48d5fdc037fcea6107fead3265e7736c4d287aa /app | |
| parent | c9c4d53718ae3653dc6a3a876c281df496766376 (diff) | |
| parent | ed86faebe1de0d7bb364341f8a36b4aac0757d0c (diff) | |
| download | gitlab-ce-aa47d99bdda5a460346db1970ced0da169036de4.tar.gz | |
Merge branch 'fix_removing_invited_member' into 'master'
Fix: Deleting an invited member causes 500 error
Closes #32504
See merge request !11481
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/members/authorized_destroy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/members/authorized_destroy_service.rb b/app/services/members/authorized_destroy_service.rb index 0f94504625a..f846d72498f 100644 --- a/app/services/members/authorized_destroy_service.rb +++ b/app/services/members/authorized_destroy_service.rb @@ -10,7 +10,7 @@ module Members return false if member.is_a?(GroupMember) && member.source.last_owner?(member.user) Member.transaction do - unassign_issues_and_merge_requests(member) + unassign_issues_and_merge_requests(member) unless member.invite? member.destroy end |