Merge branch 'issue_34852' into 'master'

fix milestones finder failing spec Closes #34852 See merge request !12727
2017-07-07 22:26:01 +00:00 · 2017-07-07 22:26:01 +00:00 · e7d18a17b4
parent 1e81c4be53 b7860b30aa
commit e7d18a17b4
1 changed files with 2 additions and 1 deletions
--- a/app/finders/milestones_finder.rb
+++ b/app/finders/milestones_finder.rb
@ -49,7 +49,8 @@ class MilestonesFinder
    if params.has_key?(:order)
      items.reorder(params[:order])
    else
-      items.reorder('due_date ASC')
+      order_statement = Gitlab::Database.nulls_last_order('due_date', 'ASC')
+      items.reorder(order_statement)
    end
  end
 end