diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
| commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /app/views/admin/reports/_status.html.haml | |
| parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
| parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
Diffstat (limited to 'app/views/admin/reports/_status.html.haml')
| -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 105352e46..fa15796d2 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -15,7 +15,7 @@ - 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), blurhash: video.blurhash, sensitive: status.proper.sensitive?, visible: false, width: 610, height: 343, inline: true, alt: video.description - - elsif status.media_attachments.first.audio? + - elsif status.proper.media_attachments.first.audio? - audio = status.proper.media_attachments.first = react_component :audio, src: audio.file.url(:original), height: 110, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) - else |