diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-12 15:09:19 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-12 15:09:19 +0000 |
commit | d9b3f39acad88d81eb7a75627c4325651fb7ff13 (patch) | |
tree | 9a10f44168d0d401c15b664c17e8a353674203b5 /app/models/namespaces/traversal/recursive.rb | |
parent | f81141c25d0dd79de8c07559bf268cb6e0d287d3 (diff) | |
download | gitlab-ce-d9b3f39acad88d81eb7a75627c4325651fb7ff13.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/namespaces/traversal/recursive.rb')
-rw-r--r-- | app/models/namespaces/traversal/recursive.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/namespaces/traversal/recursive.rb b/app/models/namespaces/traversal/recursive.rb index 90bd9b312c1..d9e8743aa50 100644 --- a/app/models/namespaces/traversal/recursive.rb +++ b/app/models/namespaces/traversal/recursive.rb @@ -78,7 +78,7 @@ module Namespaces alias_method :recursive_self_and_descendant_ids, :self_and_descendant_ids def object_hierarchy(ancestors_base) - Gitlab::ObjectHierarchy.new(ancestors_base, options: { use_distinct: Feature.enabled?(:use_distinct_in_object_hierarchy, self) }) + Gitlab::ObjectHierarchy.new(ancestors_base) end end end |