about summary refs log tree commit diff
path: root/app/views/notification_mailer/_status.html.haml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-03-19 15:41:59 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-03-19 15:41:59 -0500
commit0fa0836e63674104cea5095c5336bab8587d8634 (patch)
treebcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /app/views/notification_mailer/_status.html.haml
parentc074b226b68d81b0503f935dc81b74cd11b11d67 (diff)
parentdf70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff)
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/views/notification_mailer/_status.html.haml')
-rw-r--r--app/views/notification_mailer/_status.html.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index f82ada146..57b5688bd 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -24,6 +24,11 @@
                                       %bdi= display_name(status.account)
                                       = "@#{status.account.acct}"
 
+                              - if status.spoiler_text?
+                                %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
+                                  %p
+                                    = Formatter.instance.format_spoiler(status)
+
                               %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
                                 = Formatter.instance.format(status)