diff options
author | Mike Greiling <mgreiling@gitlab.com> | 2017-07-07 22:26:01 +0000 |
---|---|---|
committer | Mike Greiling <mgreiling@gitlab.com> | 2017-07-07 22:26:01 +0000 |
commit | e7d18a17b4d39dfd0bd52241cac622101995da7e (patch) | |
tree | 705cff160eb6a651bbdcb9151116ff7bad7f83f8 | |
parent | 1e81c4be5352c30e810ad5baf832666c61dc4f0f (diff) | |
parent | b7860b30aa4cf9d6b40ef2766912b366d916a9c7 (diff) | |
download | gitlab-ce-e7d18a17b4d39dfd0bd52241cac622101995da7e.tar.gz |
Merge branch 'issue_34852' into 'master'
fix milestones finder failing spec
Closes #34852
See merge request !12727
-rw-r--r-- | app/finders/milestones_finder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/finders/milestones_finder.rb b/app/finders/milestones_finder.rb index 23c42a5f662..0a5a0ea2f35 100644 --- 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 |