summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-05-27 16:53:20 -0300
committerFelipe Artur <felipefac@gmail.com>2016-05-31 10:35:57 -0300
commit30e61ed79c89de4c31a4d2057f710ad2b0704389 (patch)
treef4941eda8679c0e82bea0a4b0ee05f191d93696b /app/finders
parentf9bb9151b595fdc1afc1742bb51c816965908f53 (diff)
downloadgitlab-ce-30e61ed79c89de4c31a4d2057f710ad2b0704389.tar.gz
Fix error 500 when sorting issues by milestone due date and filtering by labels
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/issuable_finder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 8ed3ccf1c02..7d8c56f4c22 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -271,7 +271,7 @@ class IssuableFinder
if filter_by_no_label?
items = items.without_label
else
- items = items.with_label(label_names)
+ items = items.with_label(label_names, params[:sort])
if projects
items = items.where(labels: { project_id: projects })
end