Merge branch 'master' into glitch-soc/merge-upstream

2020-02-06 21:36:38 +01:00
parent ccaefd139d aeb6efbb03
commit 1a54b9b99e
156 changed files with 1830 additions and 544 deletions
@@ -10,7 +10,7 @@

  = opengraph 'og:site_name', site_title
  = opengraph 'og:type', 'article'
-  = opengraph 'og:title', "#{display_name(@account)} (@#{@account.local_username_and_domain})"
+  = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
  = opengraph 'og:url', short_account_status_url(@account, @status)

  = render 'og_description', activity: @status