diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
| commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
| tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/serializers | |
| parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
| parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) | |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/oembed_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb index bd05da585..af03fd47a 100644 --- a/app/serializers/oembed_serializer.rb +++ b/app/serializers/oembed_serializer.rb @@ -40,12 +40,12 @@ class OEmbedSerializer < ActiveModel::Serializer attributes = { src: embed_short_account_status_url(object.account, object), class: 'mastodon-embed', - style: 'max-width: 100%; border: none;', + style: 'max-width: 100%; border: 0', width: width, height: height, } - content_tag :iframe, nil, attributes + content_tag(:iframe, nil, attributes) + content_tag(:script, nil, src: full_asset_url('embed.js'), async: true) end def width |