kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy`

This commit is contained in:
Bob Van Landuyt 2017-10-10 16:07:41 +02:00
parent e55886b30e
commit 9d54da2361
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/gitlab/group_hierarchy.rb
View File

@ -30,8 +30,7 @@ module Gitlab
# reached. So all ancestors *lower* than the specified ancestor will be
# included.
def ancestors(upto: nil)
read_only(base_and_ancestors_cte(upto).apply_to(model.all))
.where.not(id: ancestors_base.select(:id))
base_and_ancestors(upto: upto).where.not(id: ancestors_base.select(:id))
end
# Returns a relation that includes the ancestors_base set of groups