diff options
author | ThibG <thib@sitedethib.com> | 2018-05-10 00:28:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-10 00:28:54 +0200 |
commit | 34142ab29c33104793afe3199f102d84b83b9b57 (patch) | |
tree | afba23a3f169d7445f80ffe555985a295c98f6e1 /app/views/authorize_follows | |
parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
parent | 5d8052e7156c913a551b923c51d508b1ea8837b3 (diff) |
Merge pull request #472 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'app/views/authorize_follows')
-rw-r--r-- | app/views/authorize_follows/_card.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml index e81e292ba..9abcfd37e 100644 --- a/app/views/authorize_follows/_card.html.haml +++ b/app/views/authorize_follows/_card.html.haml @@ -6,7 +6,7 @@ %span.display-name - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account) = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do - %strong.emojify= display_name(account) + %strong.emojify= display_name(account, custom_emojify: true) %span @#{account.acct} - if account.note? |