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

2017-12-07 04:17:14 +00:00
parent de56209951 0c4ca3e549
commit 744447b3c0
9 changed files with 39 additions and 20 deletions
--- a/app/serializers/rest/preview_card_serializer.rb
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -6,7 +6,7 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer
  attributes :url, :title, :description, :type,
             :author_name, :author_url, :provider_name,
             :provider_url, :html, :width, :height,
-             :image
+             :image, :embed_url

  def image
    object.image? ? full_asset_url(object.image.url(:original)) : nil