diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-04-04 18:40:29 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 18:40:29 +0300 |
| commit | ad7148d9ead6e76a80840c069ca0921f7e790041 (patch) | |
| tree | 7681db499ad5bf3e0300b578a223717788cfc95a /app/controllers/projects/labels_controller.rb | |
| parent | aff9bf11d98febc038b7deedfafb3b361ad392b2 (diff) | |
Allow assigning and filtering issuables by ancestor group labels
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 516198b1b8a..91016f6494e 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -150,7 +150,8 @@ class Projects::LabelsController < Projects::ApplicationController end def find_labels - @available_labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute + @available_labels ||= + LabelsFinder.new(current_user, project_id: @project.id, include_ancestor_groups: params[:include_ancestor_groups]).execute end def authorize_admin_labels! |