diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-06 22:48:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 22:48:26 +0100 |
| commit | 96ec90b986c8a2783135f123c10062725d274733 (patch) | |
| tree | 1cbb8b756a2e4d0770c19b834ede0326f99a3dcc /app/views/accounts | |
| parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
| parent | fe9a124f5a9f3a7cb6cfba141245cccb88c7dfbe (diff) | |
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_og.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml index de948ec6a..839576372 100644 --- a/app/views/accounts/_og.html.haml +++ b/app/views/accounts/_og.html.haml @@ -10,4 +10,4 @@ = opengraph 'og:image:width', '120' = opengraph 'og:image:height', '120' = opengraph 'twitter:card', 'summary' -= opengraph 'profile:username', account.local_username_and_domain += opengraph 'profile:username', acct(account)[1..-1] diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index c312fe2bd..c9688ea88 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = "#{display_name(@account)} (@#{@account.local_username_and_domain})" + = "#{display_name(@account)} (#{acct(@account)})" - content_for :header_tags do - if @account.user&.setting_noindex |