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

Fix 'DEPRECATION WARNING: Dangerous query method' for order_votes

See merge request gitlab-org/gitlab!21662

app/models/concerns/awardable.rb

@@ -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