diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /app/views/admin/accounts | |
parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/accounts')
-rw-r--r-- | app/views/admin/accounts/show.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index c8a9d33a7..f5ae88379 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -206,7 +206,7 @@ - if @deletion_request.present? = link_to t('admin.accounts.delete'), admin_account_path(@account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, @account) - else - %div.action-buttons + .action-buttons %div - if @account.local? && @account.user_approved? = link_to t('admin.accounts.warn'), new_admin_account_action_path(@account.id, type: 'none'), class: 'button' if can?(:warn, @account) @@ -276,9 +276,9 @@ %hr.spacer/ - if @account.user&.invite_request&.text&.present? - %div.speech-bubble - %div.speech-bubble__bubble + .speech-bubble + .speech-bubble__bubble = @account.user&.invite_request&.text - %div.speech-bubble__owner + .speech-bubble__owner = admin_account_link_to @account = t('admin.accounts.invite_request_text') |