diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
| commit | 9b861d56a9646e75caf1f7d60fa9eade566d3740 (patch) | |
| tree | a45059ea258e035c6f63e966973629b9cd0766b8 /app/views/admin/accounts/show.html.haml | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | 1c826471e7d964f0fdb2dc2b89dcd5a19c017538 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
Diffstat (limited to 'app/views/admin/accounts/show.html.haml')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 66eb49342..2b6e28e8d 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -8,20 +8,12 @@ = render 'application/card', account: @account - account = @account -- proofs = account.identity_proofs.active - fields = account.fields -- unless fields.empty? && proofs.empty? && account.note.blank? +- unless fields.empty? && account.note.blank? .admin-account-bio - - unless fields.empty? && proofs.empty? + - unless fields.empty? %div .account__header__fields - - proofs.each do |proof| - %dl - %dt= proof.provider.capitalize - %dd.verified - = link_to fa_icon('check'), proof.badge.proof_url, class: 'verified__mark', title: t('accounts.link_verified_on', date: l(proof.updated_at)) - = link_to proof.provider_username, proof.badge.profile_url - - fields.each do |field| %dl %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true) |