diff options
| author | Jarka Košanová <jarka@gitlab.com> | 2018-12-18 15:15:51 +0300 |
|---|---|---|
| committer | Jarka Košanová <jarka@gitlab.com> | 2018-12-19 17:24:29 +0300 |
| commit | b1c39553859bb1f5f830fa759f2202462fe24d98 (patch) | |
| tree | 235757cdbb225f709ecf105187b69a5f39c711bf /app/finders/groups_finder.rb | |
| parent | b1b7fa7802eecbacff04a9434eff69b0f3cbaaad (diff) | |
Rename GroupHierarchy into ObjectHierarchy
- we now use the hierarchy class also for epics
- also rename supports_nested_groups? into supports_nested_objects?
- move it to a concern
Diffstat (limited to 'app/finders/groups_finder.rb')
| -rw-r--r-- | app/finders/groups_finder.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb index ea954f98220..0080123407d 100644 --- a/app/finders/groups_finder.rb +++ b/app/finders/groups_finder.rb @@ -46,7 +46,7 @@ class GroupsFinder < UnionFinder return [Group.all] if current_user&.full_private_access? && all_available? groups = [] - groups << Gitlab::GroupHierarchy.new(groups_for_ancestors, groups_for_descendants).all_groups if current_user + groups << Gitlab::ObjectHierarchy.new(groups_for_ancestors, groups_for_descendants).all_objects if current_user groups << Group.unscoped.public_to_user(current_user) if include_public_groups? groups << Group.none if groups.empty? groups @@ -66,7 +66,7 @@ class GroupsFinder < UnionFinder .groups .where('members.access_level >= ?', params[:min_access_level]) - Gitlab::GroupHierarchy + Gitlab::ObjectHierarchy .new(groups) .base_and_descendants end |