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

2019-05-19 17:46:31 +02:00
parent 4beb8d7788 692e7cea2a
commit f509815379
10 changed files with 56 additions and 31 deletions
--- a/app/views/stream_entries/_og_image.html.haml
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -7,6 +7,8 @@
      - unless media.file.meta.nil?
        = opengraph 'og:image:width', media.file.meta.dig('original', 'width')
        = opengraph 'og:image:height', media.file.meta.dig('original', 'height')
+      - if media.description.present?
+        = opengraph 'og:image:alt', media.description
    - elsif media.video? || media.gifv?
      - player_card = true
      = opengraph 'og:image', full_asset_url(media.file.url(:small))