From bc9071a5b252c7cab386ce1d0c9a4f3679dad430 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 2 Mar 2018 09:25:25 +0100 Subject: Allow to include also descendant group labels Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542 --- app/controllers/groups/labels_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/controllers/groups/labels_controller.rb') diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb index 2e4cec830bb..ac1d97dc54a 100644 --- a/app/controllers/groups/labels_controller.rb +++ b/app/controllers/groups/labels_controller.rb @@ -18,7 +18,8 @@ class Groups::LabelsController < Groups::ApplicationController current_user, group_id: @group.id, only_group_labels: params[:only_group_labels], - include_ancestor_groups: params[:include_ancestor_groups] + include_ancestor_groups: params[:include_ancestor_groups], + include_descendant_groups: params[:include_descendant_groups] ).execute render json: LabelSerializer.new.represent_appearance(available_labels) -- cgit v1.2.1