mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 05:36:07 +10:00
Merge branch '15465-fix-sort-by-due-date' into 'master'
Remove the `.distinct` when finding issues See merge request !3858
This commit is contained in:
@@ -278,9 +278,7 @@ class IssuableFinder
|
||||
end
|
||||
end
|
||||
|
||||
# When filtering by multiple labels we may end up duplicating issues (if one
|
||||
# has multiple labels). This ensures we only return unique issues.
|
||||
items.distinct
|
||||
items
|
||||
end
|
||||
|
||||
def by_due_date(items)
|
||||
|
||||
@@ -178,6 +178,19 @@ describe 'Issues', feature: true do
|
||||
|
||||
expect(first_issue).to include('foo')
|
||||
end
|
||||
|
||||
context 'with a filter on labels' do
|
||||
let(:label) { create(:label, project: project) }
|
||||
before { create(:label_link, label: label, target: foo) }
|
||||
|
||||
it 'sorts by least recently due date by excluding nil due dates' do
|
||||
bar.update(due_date: nil)
|
||||
|
||||
visit namespace_project_issues_path(project.namespace, project, label_names: [label.name], sort: sort_value_due_date_later)
|
||||
|
||||
expect(first_issue).to include('foo')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'filtering by due date' do
|
||||
|
||||
Reference in New Issue
Block a user