diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-02 09:25:25 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-02 09:29:26 +0100 |
| commit | bc9071a5b252c7cab386ce1d0c9a4f3679dad430 (patch) | |
| tree | 532a643866d1dd325c45627cd5a14fdffee6f084 /app/controllers/groups/labels_controller.rb | |
| parent | 911fd7c252dd6c43b9771b2833460f1605dc99a2 (diff) | |
| download | gitlab-ce-jprovazn-ancestor-labels.tar.gz | |
Allow to include also descendant group labelsjprovazn-ancestor-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
Diffstat (limited to 'app/controllers/groups/labels_controller.rb')
| -rw-r--r-- | app/controllers/groups/labels_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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) |