mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 16:16:34 +00:00
Merge branch 'oauth-nickname' into 'develop'
Use User.full_nickname/1 in oauth html template See merge request pleroma/pleroma!4054
This commit is contained in:
commit
d3208d2250
2 changed files with 2 additions and 1 deletions
1
changelog.d/oauth-nickname.skip
Normal file
1
changelog.d/oauth-nickname.skip
Normal file
|
@ -0,0 +1 @@
|
|||
Use User.full_nickname/1 in oauth html template
|
|
@ -13,7 +13,7 @@
|
|||
<div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div>
|
||||
<div class="account-header__meta">
|
||||
<div class="account-header__display-name"><%= @user.name %></div>
|
||||
<div class="account-header__nickname">@<%= @user.nickname %>@<%= Pleroma.User.get_host(@user) %></div>
|
||||
<div class="account-header__nickname">@<%= Pleroma.User.full_nickname(@user.nickname) %></div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in a new issue