diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-23 13:58:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-23 13:58:35 +0300 |
| commit | 8f88a90ca3f2f2c7c341126f6816db9667664ea7 (patch) | |
| tree | 9bc009ad6e604941c3345d7e27acd58da19c57ad /docs/development/API | |
| parent | 77f3da035894e2add911101466bfe41b99ee481e (diff) | |
| parent | 484ba5d062d93fd0cf4841e7743724928af5a2d9 (diff) | |
| download | pleroma-8f88a90ca3f2f2c7c341126f6816db9667664ea7.tar.gz pleroma-8f88a90ca3f2f2c7c341126f6816db9667664ea7.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
Diffstat (limited to 'docs/development/API')
| -rw-r--r-- | docs/development/API/admin_api.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/docs/development/API/admin_api.md b/docs/development/API/admin_api.md index 04a181401..f6519830b 100644 --- a/docs/development/API/admin_api.md +++ b/docs/development/API/admin_api.md @@ -2,13 +2,6 @@ Authentication is required and the user must be an admin. -Configuration options: - -* `[:auth, :enforce_oauth_admin_scope_usage]` — OAuth admin scope requirement toggle. - If `true`, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token (client app must support admin scopes). - If `false` and token doesn't have admin scope(s), `is_admin` user flag grants access to admin-specific actions. - Note that client app needs to explicitly support admin scopes and request them when obtaining auth token. - ## `GET /api/pleroma/admin/users` ### List users |