diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 01:29:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 01:29:40 +0100 |
| commit | ca28d9c2aec0764dc9190e2802e5e6e23cf6d8c3 (patch) | |
| tree | 51d86739522f79ee545f7c821507997f0a4914cb /app/views/stream_entries/_simple_status.html.haml | |
| parent | 8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff) | |
| parent | 999cde94a6a2d67cf36160365378951d3b55b868 (diff) | |
Merge branch 'blackle-master'
Diffstat (limited to 'app/views/stream_entries/_simple_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index eba2f9ac4..95f90abd9 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -12,7 +12,10 @@ %strong.p-name.emojify= display_name(status.account) %span.p-nickname= acct(status.account) - .status__content.e-content.p-name.emojify= Formatter.instance.format(status) + .status__content.e-content.p-name.emojify< + - unless status.spoiler_text.blank? + %p= status.spoiler_text + = Formatter.instance.format(status) - unless status.media_attachments.empty? .status__attachments |