about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-09 14:16:45 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-09 14:16:45 -0600
commit991371af5f22ba85199f3f66bab5f70b404de95f (patch)
tree3e5652e1d90596c57b70d2afac72b17f183b8734 /app/views/stream_entries
parente780d5951b7eb743a718d9b34a46cd8fa5561636 (diff)
parent35b84985a8b9e57cfd3ffac8a0e3937d3c7a1167 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	db/schema.rb
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r--app/views/stream_entries/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index b52334a28..cf6671e67 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('statuses.title', name: display_name(@account), quote: truncate(@stream_entry.activity.text, length: 50, omission: '…'))
+  = t('statuses.title', name: display_name(@account), quote: truncate(@stream_entry.activity.spoiler_text.presence || @stream_entry.activity.text, length: 50, omission: '…'))
 
 - content_for :header_tags do
   - if @account.user&.setting_noindex