Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-23 10:17:18 +00:00
parent 9c3e4bdead ecdc5957a3
commit 03b2f701e7
8 changed files with 68 additions and 31 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -87,7 +87,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
  end

  def ordered_mentions
-    object.mentions.order(:id)
+    object.mentions.to_a.sort_by(&:id)
  end

  class ApplicationSerializer < ActiveModel::Serializer