tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	db/schema.rb
This commit is contained in:
David Yip
2018-01-09 14:16:45 -06:00
parent e780d5951b 35b84985a8
commit 991371af5f
7 changed files with 167 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/stream_entries/show.html.haml
View File

@@ -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