Merge tag 'v2.6.5' into instance_only_statuses

2018-12-07 15:27:23 +01:00
parent b9f0f794db 887f9de6dc
commit f5f9fc366d
298 changed files with 2754 additions and 1673 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@ -20,6 +20,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
  has_many :tags
  has_many :emojis, serializer: REST::CustomEmojiSerializer

+  has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
+
  def id
    object.id.to_s
  end