summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-28 10:40:13 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-06-28 10:40:13 +0000
commit4596ab5b6b2cb7a2f78babe62268bb66b6fd2449 (patch)
treeec746d85d1f37531abf43797079fffa751e3b42e /app/services
parentf7a9e7138f04b54ed769d3f86a6aece08f442ce7 (diff)
parent9aa832285c10f627a67b5f49870d694b27fc37c2 (diff)
downloadgitlab-ce-4596ab5b6b2cb7a2f78babe62268bb66b6fd2449.tar.gz
Merge branch 'issue-boards-closed-list-all' into 'master'
Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
Diffstat (limited to 'app/services')
-rw-r--r--app/services/boards/issues/list_service.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index 418fa9afd6e..a1d67cbc244 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -3,7 +3,7 @@ module Boards
class ListService < BaseService
def execute
issues = IssuesFinder.new(current_user, filter_params).execute
- issues = without_board_labels(issues) unless movable_list?
+ issues = without_board_labels(issues) unless movable_list? || closed_list?
issues = with_list_label(issues) if movable_list?
issues.order_by_position_and_priority
end
@@ -21,7 +21,15 @@ module Boards
end
def movable_list?
- @movable_list ||= list.present? && list.movable?
+ return @movable_list if defined?(@movable_list)
+
+ @movable_list = list.present? && list.movable?
+ end
+
+ def closed_list?
+ return @closed_list if defined?(@closed_list)
+
+ @closed_list = list.present? && list.closed?
end
def filter_params