summaryrefslogtreecommitdiff
path: root/docs/API
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-10-23 17:34:42 +0000
committerfeld <feld@feld.me>2019-10-23 17:34:42 +0000
commit17c237ba808d4356bb1e202e459680563b79ef99 (patch)
tree62faffc1033054e2aa1414d85bc0009c004c6910 /docs/API
parent54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff)
parentc0246309a5013b17a405644a0918ec0d3569eaf1 (diff)
downloadpleroma-17c237ba808d4356bb1e202e459680563b79ef99.tar.gz
pleroma-17c237ba808d4356bb1e202e459680563b79ef99.zip
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
Diffstat (limited to 'docs/API')
-rw-r--r--docs/API/admin_api.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md
index 6adeda07e..e64ae6429 100644
--- a/docs/API/admin_api.md
+++ b/docs/API/admin_api.md
@@ -170,7 +170,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
- Params: none
- Response:
- On failure: `{"error": "…"}`
- - On success: JSON of the `user.info`
+ - On success: JSON of the user
## `POST /api/pleroma/admin/users/permission_group/:permission_group`
@@ -180,7 +180,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
- `nicknames`: nicknames array
- Response:
- On failure: `{"error": "…"}`
- - On success: JSON of the `user.info`
+ - On success: JSON of the user
## DEPRECATED `DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group`
@@ -189,7 +189,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
- Params: none
- Response:
- On failure: `{"error": "…"}`
- - On success: JSON of the `user.info`
+ - On success: JSON of the user
- Note: An admin cannot revoke their own admin status.
## `DELETE /api/pleroma/admin/users/permission_group/:permission_group`
@@ -200,7 +200,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
- `nicknames`: nicknames array
- Response:
- On failure: `{"error": "…"}`
- - On success: JSON of the `user.info`
+ - On success: JSON of the user
- Note: An admin cannot revoke their own admin status.
## `PATCH /api/pleroma/admin/users/activate`