diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 09:30:30 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 09:30:30 +0300 |
| commit | b8d5c09f48a4b643f0dc60930bc69772a32a3b5e (patch) | |
| tree | 59d1903f2d204b8a5e244430cb17ef772ced5f4e /config | |
| parent | b7908844f24f4ede4244261d43f30ed3724efbb7 (diff) | |
| parent | 71bffbf0b7a3f0e245408a977c48a51763021508 (diff) | |
| download | pleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.tar.gz pleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 8b8ecc833..d706adc6e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -488,7 +488,8 @@ config :pleroma, Oban, mailer: 10, transmogrifier: 20, scheduled_activities: 10, - background: 5 + background: 5, + attachments_cleanup: 5 ], crontab: [ {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, @@ -553,7 +554,7 @@ config :ueberauth, config :pleroma, :auth, - enforce_oauth_admin_scope_usage: false, + enforce_oauth_admin_scope_usage: true, oauth_consumer_strategies: oauth_consumer_strategies config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false |