diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-25 20:54:42 +0300 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-12 05:15:31 +0300 |
| commit | aeb67dd489b1ccc7f0ab1d702725729ab9cc3e27 (patch) | |
| tree | c508ba9459274be6a8a0488a838d31f03f45faba /lib/gitlab/database.rb | |
| parent | ecffca5d92353d55aaf8f984737fa617782310e0 (diff) | |
Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
Diffstat (limited to 'lib/gitlab/database.rb')
| -rw-r--r-- | lib/gitlab/database.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 1177f8ea99e..64e7f371115 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -128,7 +128,7 @@ module Gitlab order = "#{field} IS NULL, #{order}" if direction == 'ASC' end - order + Arel.sql(order) end def self.nulls_first_order(field, direction = 'ASC') @@ -142,7 +142,7 @@ module Gitlab order = "#{field} IS NULL, #{order}" if direction == 'DESC' end - order + Arel.sql(order) end def self.random |