Commit 1fcfac98 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'ab-fix-deprecation-warning' into 'master'

Fix 'DEPRECATION WARNING: Dangerous query method' for order_votes

See merge request gitlab-org/gitlab!21662
parents 4beb564b a3467c3d
......@@ -67,7 +67,9 @@ module Awardable
)
).join_sources
joins(join_clause).group(awardable_table[:id]).reorder("COUNT(award_emoji.id) #{direction}")
joins(join_clause).group(awardable_table[:id]).reorder(
Arel.sql("COUNT(award_emoji.id) #{direction}")
)
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment