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:
Diffstat (limited to 'app/models/members/group_member.rb')
-rw-r--r--app/models/members/group_member.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index 52b9c3a80e3..b5a590d646e 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -62,9 +62,13 @@ class GroupMember < Member
return false unless access_level == Gitlab::Access::OWNER
return last_owner unless last_owner.nil?
- group.member_owners_excluding_project_bots.where.not(
- group: group, user_id: user_id
- ).empty?
+ owners = group.member_owners_excluding_project_bots
+
+ owners.reject! do |member|
+ member.group == group && member.user_id == user_id
+ end
+
+ owners.empty?
end
private