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/services/boards/lists | |
| parent | aff9bf11d98febc038b7deedfafb3b361ad392b2 (diff) | |
Allow assigning and filtering issuables by ancestor group labels
Diffstat (limited to 'app/services/boards/lists')
| -rw-r--r-- | app/services/boards/lists/create_service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb index bebc90c7a8d..02f1c709374 100644 --- a/app/services/boards/lists/create_service.rb +++ b/app/services/boards/lists/create_service.rb @@ -12,11 +12,15 @@ module Boards private def available_labels_for(board) + options = { include_ancestor_groups: true } + if board.group_board? - parent.labels + options.merge!(group_id: parent.id, only_group_labels: true) else - LabelsFinder.new(current_user, project_id: parent.id).execute + options[:project_id] = parent.id end + + LabelsFinder.new(current_user, options).execute end def next_position(board) |