diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/finders/group_members_finder.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/finders/group_members_finder.rb')
| -rw-r--r-- | app/finders/group_members_finder.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index a6ecd835527..982234f7506 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -4,6 +4,12 @@ class GroupMembersFinder < UnionFinder RELATIONS = %i(direct inherited descendants).freeze DEFAULT_RELATIONS = %i(direct inherited).freeze + RELATIONS_DESCRIPTIONS = { + direct: 'Members in the group itself', + inherited: "Members in the group's ancestor groups", + descendants: "Members in the group's subgroups" + }.freeze + include CreatedAtFilter # Params can be any of the following: @@ -82,4 +88,4 @@ class GroupMembersFinder < UnionFinder end end -GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder') +GroupMembersFinder.prepend_mod_with('GroupMembersFinder') |