diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 19:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 19:12:07 +0200 |
| commit | af934b90710a2ce1099d3ceda5de7bcf0e94595c (patch) | |
| tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /app/views/admin | |
| parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
| parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) | |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/reports/_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 5b410ec84..4d557b071 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -14,7 +14,7 @@ - unless status.proper.media_attachments.empty? - if status.proper.media_attachments.first.video? - video = status.proper.media_attachments.first - = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true + = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true, alt: video.description - else = react_component :media_gallery, height: 343, sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.proper.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } |