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/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@ -23,8 +23,7 @@

      - unless status.media_attachments.empty?
        .status__attachments><
-          - if status.sensitive?
-            = render partial: 'stream_entries/content_spoiler'
+          = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
          - if status.media_attachments.first.video?
            .status__attachments__inner<
              .video-item<