diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-19 17:24:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-19 17:24:08 +0300 |
| commit | ead2d18826cf446fd7da542c55b6601e9bfc001c (patch) | |
| tree | 8fb08b5673235ae9844ca858a34b742d1b548a70 /config | |
| parent | 455e072d27f28c39050b2dc24b346a8f2ef30f90 (diff) | |
| parent | d23a80e6911a85e2377ad2336a050e0206c74db9 (diff) | |
| download | pleroma-ead2d18826cf446fd7da542c55b6601e9bfc001c.tar.gz pleroma-ead2d18826cf446fd7da542c55b6601e9bfc001c.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Diffstat (limited to 'config')
| -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 |