Merge remote-tracking branch 'origin/master' into gs-master

This commit is contained in:
David Yip
2017-11-27 11:29:04 -06:00
29 changed files with 440 additions and 6 deletions

View File

@@ -8,7 +8,7 @@
= opengraph 'og:site_name', site_title
= opengraph 'og:type', 'article'
= opengraph 'og:title', "#{@account.display_name} on #{site_hostname}"
= opengraph 'og:title', "#{@account.display_name.presence || @account.username} on #{site_hostname}"
= opengraph 'og:url', account_stream_entry_url(@account, @stream_entry)
= render 'stream_entries/og_description', activity: @stream_entry.activity