summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-21 18:49:08 +0200
committerRémy Coutable <remy@rymai.me>2016-04-21 18:49:08 +0200
commit5e37d02d0ebd64249186577e306b7c502953a2e1 (patch)
tree0e976119858593f193295ae7c3ed6f96ea0c2b25
parentd2bf73b7763a4cf51d3319cf8056534a2ce22fda (diff)
downloadgitlab-ce-15465-fix-sort-by-due-date.tar.gz
Remove the `.distinct` when finding issues15465-fix-sort-by-due-date
This is not needed anymore after !3815. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/finders/issuable_finder.rb4
-rw-r--r--spec/features/issues_spec.rb13
2 files changed, 14 insertions, 3 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 93aa30b3255..f00f3f709e9 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -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)
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 90476ab369b..b1d49875ac4 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -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