Merge branch 'master' into glitch-soc/merge-upstream

2018-10-28 08:37:49 +01:00
parent 008f98b304 26fe37c414
commit b00f60f1d3
44 changed files with 267 additions and 256 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@ -21,6 +21,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