summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-17 09:24:08 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-17 09:24:08 +0300
commita879c396bb3a07929d4821ef2c29610808962c6d (patch)
treec0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6 /config/description.exs
parent22fc271e23a5dd1570ea7429b563f6edc42613c4 (diff)
parent804b961d3c8e0034c7b6057a164126e5d01a084b (diff)
downloadpleroma-a879c396bb3a07929d4821ef2c29610808962c6d.tar.gz
pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.zip
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs
index 70e963399..45e4b43f1 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2095,6 +2095,15 @@ config :pleroma, :config_description, [
description: "Authentication / authorization settings",
children: [
%{
+ key: :enforce_oauth_admin_scope_usage,
+ type: :boolean,
+ description:
+ "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."
+ },
+ %{
key: :auth_template,
type: :string,
description: