diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-12-16 16:19:28 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-12-16 16:20:44 +0100 |
commit | b2526316f54839968c821295e63066beaa425159 (patch) | |
tree | b13a52c19923edfb80518f82ac060f296e68aeb2 /app/views/admin/pending_accounts/_account.html.haml | |
parent | d911c17f521d6b13861caa886715a50b644007a1 (diff) | |
parent | 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.
Diffstat (limited to 'app/views/admin/pending_accounts/_account.html.haml')
-rw-r--r-- | app/views/admin/pending_accounts/_account.html.haml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml deleted file mode 100644 index 5b475b59a..000000000 --- a/app/views/admin/pending_accounts/_account.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -.batch-table__row - %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox - = f.check_box :account_ids, { multiple: true, include_hidden: false }, account.id - .batch-table__row__content.pending-account - .pending-account__header - = link_to admin_account_path(account.id) do - %strong= account.user_email - = "(@#{account.username})" - %br/ - %samp= account.user_current_sign_in_ip - • - = t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at) - - - if account.user&.invite_request&.text&.present? - .pending-account__body - %p= account.user&.invite_request&.text |