diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-03 17:04:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-03 17:04:27 +0000 |
| commit | b73a1a33de76dc848037a5d0e951866bd21f92c4 (patch) | |
| tree | 1427325f5fa0e386a4b1c210d32b243248f0b266 /config | |
| parent | 9ef664ffceed15727fd185c4c119025d0ee21e30 (diff) | |
| parent | 816db3f494c6fcc60d0a700dfc473a9cc49c84a0 (diff) | |
| download | pleroma-b73a1a33de76dc848037a5d0e951866bd21f92c4.tar.gz pleroma-b73a1a33de76dc848037a5d0e951866bd21f92c4.zip | |
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 11ee220e7..34b516e02 100644 --- a/config/config.exs +++ b/config/config.exs @@ -12,7 +12,7 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes config :pleroma, Pleroma.Captcha, enabled: false, - seconds_retained: 180, + seconds_valid: 60, method: Pleroma.Captcha.Kocaptcha config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" diff --git a/config/test.exs b/config/test.exs index 51aace407..67ed4737f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -9,7 +9,8 @@ config :pleroma, Pleroma.Web.Endpoint, # Disable captha for tests config :pleroma, Pleroma.Captcha, - enabled: true, + # It should not be enabled for automatic tests + enabled: false, # A fake captcha service for tests method: Pleroma.Captcha.Mock |