diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-16 13:08:00 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-16 13:08:00 +0000 |
| commit | e659fbfbf9ec586ea0086a78a7443e77abebf1ab (patch) | |
| tree | 667cdea9c15206acb4ff0482c6ad80b69af3fb24 | |
| parent | 8efacfed677ea2f06ac228294faec77a38060976 (diff) | |
| parent | fc484e5ce67117389ce9e2cce22ab1944a759242 (diff) | |
| download | pleroma-e659fbfbf9ec586ea0086a78a7443e77abebf1ab.tar.gz pleroma-e659fbfbf9ec586ea0086a78a7443e77abebf1ab.zip | |
Merge branch 'kocaptcha-default-endpoint' into 'develop'
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 370ddd855..47098858b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -70,6 +70,8 @@ config :pleroma, Pleroma.Captcha, seconds_valid: 60, method: Pleroma.Captcha.Native +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + config :pleroma, :hackney_pools, federation: [ max_connections: 50, diff --git a/config/test.exs b/config/test.exs index b48b89c8f..d52ced612 100644 --- a/config/test.exs +++ b/config/test.exs @@ -95,8 +95,6 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |