Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00
parent bcf7ee48e9 056b5ed72f
commit 79d898ae0a
340 changed files with 4980 additions and 2321 deletions
--- 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 }