diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-18 08:18:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-18 08:18:00 +0000 |
| commit | 85ca8931de2d59920f2804771db4ac6a6e44a73c (patch) | |
| tree | 8754a7a6b17f0012bafef0c3d379f41a22f35a42 /app/services | |
| parent | 97664956277cc2433887062afabc9b35c779c414 (diff) | |
| parent | 50a62b479e354efce5d85dd46bc25033cfd066f3 (diff) | |
| download | gitlab-ce-85ca8931de2d59920f2804771db4ac6a6e44a73c.tar.gz | |
Merge branch '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master'
Resolve "Open issues from archived project listed in group issue board"
Closes #45754
See merge request gitlab-org/gitlab-ce!21721
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/boards/issues/list_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index 4e352f2dc63..0b69661bbd0 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -56,6 +56,7 @@ module Boards set_parent set_state set_scope + set_non_archived params end @@ -76,6 +77,10 @@ module Boards params[:include_subgroups] = board.group_board? end + def set_non_archived + params[:non_archived] = parent.is_a?(Group) + end + # rubocop: disable CodeReuse/ActiveRecord def board_label_ids @board_label_ids ||= board.lists.movable.pluck(:label_id) |