diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-14 15:01:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-14 15:01:09 +0000 |
| commit | ecb3386f939de3ffba16f9419994a009f2e59ded (patch) | |
| tree | febe52f1b2cf59be4530ebc4f223f06e342c207c /config/config.exs | |
| parent | 0ba3f1ffb28792c21809fa9a30fc03a7a52d9361 (diff) | |
| parent | 3b407a9a295da3f6c2fc91982088f066f2c3c711 (diff) | |
| download | pleroma-1.1.7.tar.gz | |
Merge branch 'release/1.1.7' into 'stable'v1.1.7
Release/1.1.7
See merge request pleroma/pleroma!2065
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 4efadb823..d2f081dd8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,9 +52,9 @@ config :pleroma, Pleroma.Repo, migration_lock: nil config :pleroma, Pleroma.Captcha, - enabled: false, + enabled: true, seconds_valid: 60, - method: Pleroma.Captcha.Kocaptcha + method: Pleroma.Captcha.Native config :pleroma, :hackney_pools, federation: [ @@ -70,8 +70,6 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - # Upload configuration config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, |