diff options
| author | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
| commit | 44a86951a339fdb0146a237ca5178c83823629c7 (patch) | |
| tree | e38ad0c1ecf198a69762dfc95f158e649d9d4723 /lib/pleroma/web/admin_api | |
| parent | 63923df0a51fdae58daf71a8dd85929a29ab1546 (diff) | |
| parent | 0ad6ea205711df9d1c634f0ad2dde6d432544318 (diff) | |
| download | pleroma-44a86951a339fdb0146a237ca5178c83823629c7.tar.gz | |
Merge branch 'develop' into refactor/approval_pending_user_field
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 1a876d272..34bf2e67a 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -77,7 +77,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "local" => user.local, "roles" => User.roles(user), "tags" => user.tags || [], - "confirmation_pending" => user.confirmation_pending, + "is_confirmed" => user.is_confirmed, "is_approved" => user.is_approved, "url" => user.uri || user.ap_id, "registration_reason" => user.registration_reason, |