diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
| commit | 79d898ae0ad8c0e66bd63ec3e0904e9e5e7894e8 (patch) | |
| tree | ee8d832ed2f11e9afe62daf0e586a86004eb8d98 /app/views/stream_entries/_detailed_status.html.haml | |
| parent | bcf7ee48e94cd2e4d2de28e8854e7f0e2b5cad1f (diff) | |
| parent | 056b5ed72f6d980bceeb49eb249b8365fe8fce66 (diff) | |
Merge upstream!! #64 <3 <3
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 589d647ce..157a7e7fb 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -18,13 +18,11 @@ - unless status.media_attachments.empty? - if status.media_attachments.first.video? .video-player>< - - if status.sensitive? - = render partial: 'stream_entries/content_spoiler' + = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? } %video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true } - else .detailed-status__attachments>< - - if status.sensitive? - = render partial: 'stream_entries/content_spoiler' + = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? } .status__attachments__inner< - status.media_attachments.each do |media| = render partial: 'stream_entries/media', locals: { media: media } |