diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-17 20:26:59 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-01-17 20:26:59 +0000 |
| commit | f351cc28c2c878bf491bb0886be65bf35b58b261 (patch) | |
| tree | 987d0a33d93dce35b4b25c401ae2c772760299d6 /app/finders/milestones_finder.rb | |
| parent | 3b13159d9c83e8ce679663ce264854ea94bee8a2 (diff) | |
| parent | d1eb3ff594b42d6e9625724119f52d3356045870 (diff) | |
| download | gitlab-ce-f351cc28c2c878bf491bb0886be65bf35b58b261.tar.gz | |
Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'
Backport 10.3.4 security fixes into master
See merge request gitlab-org/gitlab-ce!16509
Diffstat (limited to 'app/finders/milestones_finder.rb')
| -rw-r--r-- | app/finders/milestones_finder.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/finders/milestones_finder.rb b/app/finders/milestones_finder.rb index 0a5a0ea2f35..b4605fca193 100644 --- a/app/finders/milestones_finder.rb +++ b/app/finders/milestones_finder.rb @@ -46,11 +46,7 @@ class MilestonesFinder end def order(items) - if params.has_key?(:order) - items.reorder(params[:order]) - else - order_statement = Gitlab::Database.nulls_last_order('due_date', 'ASC') - items.reorder(order_statement) - end + order_statement = Gitlab::Database.nulls_last_order('due_date', 'ASC') + items.reorder(order_statement).order('title ASC') end end |