BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
4596ab5b
Commit
4596ab5b
authored
Jun 28, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-boards-closed-list-all' into 'master'
Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
parents
f7a9e713
9aa83228
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
list_service.rb
app/services/boards/issues/list_service.rb
+10
-2
issue-boards-closed-list-all.yml
changelogs/unreleased/issue-boards-closed-list-all.yml
+4
-0
list_service_spec.rb
spec/services/boards/issues/list_service_spec.rb
+1
-1
No files found.
app/services/boards/issues/list_service.rb
View file @
4596ab5b
...
...
@@ -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
...
...
changelogs/unreleased/issue-boards-closed-list-all.yml
0 → 100644
View file @
4596ab5b
---
title
:
Fixed issue boards closed list not showing all closed issues
merge_request
:
author
:
spec/services/boards/issues/list_service_spec.rb
View file @
4596ab5b
...
...
@@ -67,7 +67,7 @@ describe Boards::Issues::ListService, services: true do
issues
=
described_class
.
new
(
project
,
user
,
params
).
execute
expect
(
issues
).
to
eq
[
closed_issue4
,
closed_issue2
,
closed_issue3
,
closed_issue1
]
expect
(
issues
).
to
eq
[
closed_issue4
,
closed_issue2
,
closed_issue
5
,
closed_issue
3
,
closed_issue1
]
end
it
'returns opened issues that have label list applied when listing issues from a label list'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment