Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-09-22 18:36:39 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-04 23:49:42 +0300
commitcd85c22faa7092edabf252fa157125ea571ed054 (patch)
tree975bb2503d17fa8b0f255225e6d915cd503cb3a7 /app/serializers/group_child_serializer.rb
parentcd8e1b85b64ea9eb6a6a5b6de80e00ccc292c6ce (diff)
Rename hierarchies to descendants where applicable
Diffstat (limited to 'app/serializers/group_child_serializer.rb')
-rw-r--r--app/serializers/group_child_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/group_child_serializer.rb b/app/serializers/group_child_serializer.rb
index f2ec741d32c..ba81f99fff4 100644
--- a/app/serializers/group_child_serializer.rb
+++ b/app/serializers/group_child_serializer.rb
@@ -27,7 +27,7 @@ class GroupChildSerializer < BaseSerializer
if children.is_a?(GroupDescendant)
represent_hierarchy(children.hierarchy(hierarchy_root), opts).first
else
- hierarchies = GroupDescendant.merge_hierarchies(children, hierarchy_root)
+ hierarchies = GroupDescendant.build_hierarchy(children, hierarchy_root)
represent_hierarchy(hierarchies, opts)
end
end