Merge branch 'issue_34852' into 'master'

fix milestones finder failing spec

Closes #34852

See merge request !12727
This commit is contained in:
Mike Greiling 2017-07-07 22:26:01 +00:00
commit e7d18a17b4

View file

@ -49,7 +49,8 @@ class MilestonesFinder
if params.has_key?(:order) if params.has_key?(:order)
items.reorder(params[:order]) items.reorder(params[:order])
else else
items.reorder('due_date ASC') order_statement = Gitlab::Database.nulls_last_order('due_date', 'ASC')
items.reorder(order_statement)
end end
end end
end end