Commit dcfda304 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'revert/5991' into 'master'

Revert "Label list shows all issues (opened or closed) with that label"

## What does this MR do?

Revert changes made on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5991. Reasoning here: https://gitlab.com/gitlab-org/gitlab-ce/issues/21691#note_16516861

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [X] Added for this feature/bug
  - [ ] All builds are passing
- [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #21691

See merge request !6695
parents 9802d388 0afe899b
...@@ -17,6 +17,7 @@ v 8.13.0 (unreleased) ...@@ -17,6 +17,7 @@ v 8.13.0 (unreleased)
- Simplify Mentionable concern instance methods - Simplify Mentionable concern instance methods
- Fix permission for setting an issue's due date - Fix permission for setting an issue's due date
- API: Multi-file commit !6096 (mahcsig) - API: Multi-file commit !6096 (mahcsig)
- Revert "Label list shows all issues (opened or closed) with that label"
- Expose expires_at field when sharing project on API - Expose expires_at field when sharing project on API
- Fix VueJS template tags being rendered in code comments - Fix VueJS template tags being rendered in code comments
- Fix issue with page scrolling to top when closing or pinning sidebar (lukehowell) - Fix issue with page scrolling to top when closing or pinning sidebar (lukehowell)
......
...@@ -36,12 +36,7 @@ module Boards ...@@ -36,12 +36,7 @@ module Boards
end end
def set_state def set_state
params[:state] = params[:state] = list.done? ? 'closed' : 'opened'
case list.list_type.to_sym
when :backlog then 'opened'
when :done then 'closed'
else 'all'
end
end end
def board_label_ids def board_label_ids
......
...@@ -31,9 +31,10 @@ Below is a table of the definitions used for GitLab's Issue Board. ...@@ -31,9 +31,10 @@ Below is a table of the definitions used for GitLab's Issue Board.
There are three types of lists, the ones you create based on your labels, and There are three types of lists, the ones you create based on your labels, and
two default: two default:
- **Backlog** (default): shows all opened issues that do not fall in one of the other lists. Always appears on the very left. - **Backlog** (default): shows all issues that do not fall in one of the other lists. Always appears on the very left.
- **Done** (default): shows all closed issues that do not fall in one of the other lists. Always appears on the very right. - **Done** (default): shows all closed issues. Always appears on the very right.
- Label list: a list based on a label. It shows all opened or closed issues with that label. Label list: a list based on a label. It shows all issues with that label.
- Label list: a list based on a label. It shows all opened issues with that label.
![GitLab Issue Board](img/issue_board.png) ![GitLab Issue Board](img/issue_board.png)
......
...@@ -30,7 +30,7 @@ describe Boards::Issues::ListService, services: true do ...@@ -30,7 +30,7 @@ describe Boards::Issues::ListService, services: true do
let!(:closed_issue1) { create(:labeled_issue, :closed, project: project, labels: [bug]) } let!(:closed_issue1) { create(:labeled_issue, :closed, project: project, labels: [bug]) }
let!(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3]) } let!(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3]) }
let!(:closed_issue3) { create(:issue, :closed, project: project) } let!(:closed_issue3) { create(:issue, :closed, project: project) }
let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1, development]) } let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1]) }
before do before do
project.team << [user, :developer] project.team << [user, :developer]
...@@ -58,15 +58,15 @@ describe Boards::Issues::ListService, services: true do ...@@ -58,15 +58,15 @@ describe Boards::Issues::ListService, services: true do
issues = described_class.new(project, user, params).execute issues = described_class.new(project, user, params).execute
expect(issues).to eq [closed_issue2, closed_issue3, closed_issue1] expect(issues).to eq [closed_issue4, closed_issue2, closed_issue3, closed_issue1]
end end
it 'returns opened/closed issues that have label list applied when listing issues from a label list' do it 'returns opened issues that have label list applied when listing issues from a label list' do
params = { id: list1.id } params = { id: list1.id }
issues = described_class.new(project, user, params).execute issues = described_class.new(project, user, params).execute
expect(issues).to eq [closed_issue4, list1_issue3, list1_issue1, list1_issue2] expect(issues).to eq [list1_issue3, list1_issue1, list1_issue2]
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment