summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-06-27 17:35:35 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-06-28 15:50:29 -0300
commitda3e4f412846b754d31439da0d884181653bced0 (patch)
treee1c6da18204cf5c7990c350c5b9c01501ff60192 /app/models
parent9f44687a14d57fec596b9736584bf8718df75a2e (diff)
downloadgitlab-ce-da3e4f412846b754d31439da0d884181653bced0.tar.gz
Add "members_count" and "parent_id" data on namespaces API
Diffstat (limited to 'app/models')
-rw-r--r--app/models/group.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb
index 0b93460d473..a6fdb30f84c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -222,6 +222,12 @@ class Group < Namespace
User.where(id: members_with_parents.select(:user_id))
end
+ def users_with_descendants
+ members_with_descendants = GroupMember.non_request.where(source_id: descendants.pluck(:id).push(id))
+
+ User.where(id: members_with_descendants.select(:user_id))
+ end
+
def max_member_access_for_user(user)
return GroupMember::OWNER if user.admin?