Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
.name
|
||||
= t 'users.signed_in_as'
|
||||
%span.username @#{current_account.local_username_and_domain}
|
||||
= link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button' do
|
||||
= link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button', title: t('applications.logout'), 'aria-label': t('applications.logout') do
|
||||
= fa_icon 'sign-out'
|
||||
|
||||
.container-alt= yield
|
||||
|
Reference in New Issue
Block a user