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-07 20:08:56 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-04 23:49:41 +0300
commit518216c0627cb6c4b3db62f10877b44d0e912ddb (patch)
tree68a4aa0a3301728097e73c6e09c48780a1b52757 /app/controllers/groups_controller.rb
parent530cf2a2669ea1ee3c41d48a15919f875babefa4 (diff)
Merge group hierarchies when parents are shared
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 4f0d1f88e58..a714f2cc7b0 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -77,6 +77,7 @@ class GroupsController < Groups::ApplicationController
render json: GroupChildSerializer
.new(current_user: current_user)
.with_pagination(request, response)
+ .hierarchy_base(parent, open_hierarchy: filter[:filter].present)
.represent(@children)
end
end