diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-17 22:31:11 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-17 22:31:11 +0000 |
| commit | c0437d12440acb08f30a456fade657de735c19d8 (patch) | |
| tree | 36eb248552c51c1bd234966b65b2aa9a855772cd /config | |
| parent | 679a2e799e464f044d7afceb4c9a650d2d3b2e2a (diff) | |
| parent | 2ab9499258ee4abe92dd89dfe8ebaf0a7dad7564 (diff) | |
| download | pleroma-c0437d12440acb08f30a456fade657de735c19d8.tar.gz pleroma-c0437d12440acb08f30a456fade657de735c19d8.zip | |
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Remove `:auth, :enforce_oauth_admin_scope_usage`
See merge request pleroma/pleroma!3327
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 0fbca06f3..66aee3264 100644 --- a/config/config.exs +++ b/config/config.exs @@ -611,10 +611,7 @@ config :ueberauth, base_path: "/oauth", providers: ueberauth_providers -config :pleroma, - :auth, - enforce_oauth_admin_scope_usage: true, - oauth_consumer_strategies: oauth_consumer_strategies +config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false |