diff options
author | lain <lain@soykaf.club> | 2020-08-21 08:36:56 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-21 08:36:56 +0000 |
commit | 02db6c596eff8cd0298a9f582844fe1720ade17d (patch) | |
tree | 366b3b21c543da594a2e854b09f98cfac412b4fe /lib | |
parent | 5c2b6922e1463fe7c22149a92cd5749cb5b41505 (diff) | |
parent | 1f8c32b773b56e950285ce96cb9a62f045f2a225 (diff) | |
download | pleroma-02db6c596eff8cd0298a9f582844fe1720ade17d.tar.gz |
Merge branch 'feature/2071-actor-type' into 'develop'
Adding actor type in user show
Closes #2071
See merge request pleroma/pleroma!2910
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 3 |
1 files changed, 2 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 333e72e42..9c477feab 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -79,7 +79,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "confirmation_pending" => user.confirmation_pending, "approval_pending" => user.approval_pending, "url" => user.uri || user.ap_id, - "registration_reason" => user.registration_reason + "registration_reason" => user.registration_reason, + "actor_type" => user.actor_type } end |