mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2025-01-05 06:48:41 +00:00
Merge branch 'docs-fix' into 'develop'
Correct response in AdminAPI docs See merge request pleroma/pleroma!4240
This commit is contained in:
commit
1e8b79956e
2 changed files with 17 additions and 14 deletions
0
changelog.d/docs-fix.skip
Normal file
0
changelog.d/docs-fix.skip
Normal file
|
@ -433,7 +433,7 @@ Response:
|
||||||
* On success: URL of the unfollowed relay
|
* On success: URL of the unfollowed relay
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{"https://example.com/relay"}
|
"https://example.com/relay"
|
||||||
```
|
```
|
||||||
|
|
||||||
## `POST /api/v1/pleroma/admin/users/invite_token`
|
## `POST /api/v1/pleroma/admin/users/invite_token`
|
||||||
|
@ -1193,7 +1193,8 @@ Loads json generated from `config/descriptions.exs`.
|
||||||
- Response:
|
- Response:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
[
|
{
|
||||||
|
"items": [
|
||||||
{
|
{
|
||||||
"id": 1234,
|
"id": 1234,
|
||||||
"data": {
|
"data": {
|
||||||
|
@ -1206,7 +1207,9 @@ Loads json generated from `config/descriptions.exs`.
|
||||||
"time": 1502812026, // timestamp
|
"time": 1502812026, // timestamp
|
||||||
"message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message
|
"message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"total": 1
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## `POST /api/v1/pleroma/admin/reload_emoji`
|
## `POST /api/v1/pleroma/admin/reload_emoji`
|
||||||
|
|
Loading…
Reference in a new issue