logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: e659fbfbf9ec586ea0086a78a7443e77abebf1ab
parent 8efacfed677ea2f06ac228294faec77a38060976
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 16 Dec 2019 13:08:00 +0000

Merge branch 'kocaptcha-default-endpoint' into 'develop'

Add default endpoint to Pleroma.Captcha.Kocaptcha

See merge request pleroma/pleroma!2070

Diffstat:

Mconfig/config.exs2++
Mconfig/test.exs2--
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 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 @@ -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