diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
commit | 0fa0836e63674104cea5095c5336bab8587d8634 (patch) | |
tree | bcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /app/views/notification_mailer/_status.text.erb | |
parent | c074b226b68d81b0503f935dc81b74cd11b11d67 (diff) | |
parent | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff) |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/views/notification_mailer/_status.text.erb')
-rw-r--r-- | app/views/notification_mailer/_status.text.erb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb index 85a0136b7..8999a1f8e 100644 --- a/app/views/notification_mailer/_status.text.erb +++ b/app/views/notification_mailer/_status.text.erb @@ -1,3 +1,8 @@ +<% if status.spoiler_text? %> +<%= raw status.spoiler_text %> +---- + +<% end %> <%= raw Formatter.instance.plaintext(status) %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> |