summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-10-10 16:01:42 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-10 16:55:02 +0200
commite55886b30ec80cef8b5c956cf1f0b1e0c6419fc9 (patch)
tree8d77c3fc5575efa8fd35dd976ffff46fb40d6585 /app/serializers
parent9d1348d66838b4c5e25ba133d486239482973fca (diff)
downloadgitlab-ce-e55886b30ec80cef8b5c956cf1f0b1e0c6419fc9.tar.gz
Return `self` from `GroupChildSerializer#expand_hierarchy`
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/group_child_serializer.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/serializers/group_child_serializer.rb b/app/serializers/group_child_serializer.rb
index 6bae7ba334a..6d0e67a37cd 100644
--- a/app/serializers/group_child_serializer.rb
+++ b/app/serializers/group_child_serializer.rb
@@ -6,10 +6,10 @@ class GroupChildSerializer < BaseSerializer
entity GroupChildEntity
def expand_hierarchy(hierarchy_root = nil)
- tap do
- @hierarchy_root = hierarchy_root
- @should_expand_hierarchy = true
- end
+ @hierarchy_root = hierarchy_root
+ @should_expand_hierarchy = true
+
+ self
end
def represent(resource, opts = {}, entity_class = nil)
@@ -41,7 +41,7 @@ class GroupChildSerializer < BaseSerializer
.merge(children: Array.wrap(serializer.represent_hierarchy(children, opts)))
end
elsif hierarchy.is_a?(Array)
- hierarchy.map { |child| serializer.represent_hierarchy(child, opts) }.flatten
+ hierarchy.flat_map { |child| serializer.represent_hierarchy(child, opts) }
else
serializer.represent(hierarchy, opts)
end