diff options
Diffstat (limited to 'app/finders/members_finder.rb')
-rw-r--r-- | app/finders/members_finder.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/finders/members_finder.rb b/app/finders/members_finder.rb index 013ed03a789..1ff2ad01b63 100644 --- a/app/finders/members_finder.rb +++ b/app/finders/members_finder.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true class MembersFinder + RELATIONS = %i(direct inherited descendants invited_groups).freeze + DEFAULT_RELATIONS = %i(direct inherited).freeze + # Params can be any of the following: # sort: string # search: string @@ -13,7 +16,7 @@ class MembersFinder @params = params end - def execute(include_relations: [:inherited, :direct]) + def execute(include_relations: DEFAULT_RELATIONS) members = find_members(include_relations) filter_members(members) @@ -56,7 +59,7 @@ class MembersFinder def group_union_members(include_relations) [].tap do |members| members << direct_group_members(include_relations.include?(:descendants)) if group - members << project_invited_groups_members if include_relations.include?(:invited_groups_members) + members << project_invited_groups if include_relations.include?(:invited_groups) end end @@ -66,7 +69,7 @@ class MembersFinder GroupMembersFinder.new(group).execute(include_relations: requested_relations).non_invite.non_minimal_access # rubocop: disable CodeReuse/Finder end - def project_invited_groups_members + def project_invited_groups invited_groups_ids_including_ancestors = Gitlab::ObjectHierarchy .new(project.invited_groups) .base_and_ancestors |