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
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-05-18 16:18:26 +0300
committerValery Sizov <valery@gitlab.com>2017-05-18 16:26:39 +0300
commited86faebe1de0d7bb364341f8a36b4aac0757d0c (patch)
treed911db935b4f9f5f1bf942f3fc003f76a4f9e852 /app/services/members
parent72119e7f38d5c50d2f1333adfedd6922d3e65ad1 (diff)
Fix: Deleting an invited member causes 500 error
Diffstat (limited to 'app/services/members')
-rw-r--r--app/services/members/authorized_destroy_service.rb2
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