diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-25 22:00:58 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-26 11:45:18 -0500 |
| commit | d799814d9495c09d121b5e9f8018d064f564a52c (patch) | |
| tree | 2cd71cb71ebabcd68f9d69cd7d20d09788921d74 /app | |
| parent | 999859a464003ea836a1301bf33b4f38fe8490bc (diff) | |
| download | gitlab-ce-d799814d9495c09d121b5e9f8018d064f564a52c.tar.gz | |
Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master'
Resolve "Sorting by name on explore projects page renders a 500 error when logged in"
Closes #48339
See merge request gitlab-org/gitlab-ce!20162
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/sortable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb index db7254c27e0..cb76ae971d4 100644 --- a/app/models/concerns/sortable.rb +++ b/app/models/concerns/sortable.rb @@ -12,8 +12,8 @@ module Sortable scope :order_created_asc, -> { reorder(created_at: :asc) } scope :order_updated_desc, -> { reorder(updated_at: :desc) } scope :order_updated_asc, -> { reorder(updated_at: :asc) } - scope :order_name_asc, -> { reorder("lower(name) asc") } - scope :order_name_desc, -> { reorder("lower(name) desc") } + scope :order_name_asc, -> { reorder(Arel::Nodes::Ascending.new(arel_table[:name].lower)) } + scope :order_name_desc, -> { reorder(Arel::Nodes::Descending.new(arel_table[:name].lower)) } end module ClassMethods |