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.
This commit is contained in:
@@ -129,6 +129,8 @@ class Account < ApplicationRecord
|
||||
:unconfirmed_email,
|
||||
:current_sign_in_ip,
|
||||
:current_sign_in_at,
|
||||
:created_at,
|
||||
:sign_up_ip,
|
||||
:confirmed?,
|
||||
:approved?,
|
||||
:pending?,
|
||||
|
Reference in New Issue
Block a user