diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-16 22:34:21 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-16 22:34:21 +0700 |
| commit | b9a87b1baa0650bfb4b699054304daae585a0e9a (patch) | |
| tree | 015e7c8da2f0aabf68c8ca27414dd579ab880e69 /config | |
| parent | 7528322f83d5bee92a030e2e626436dab327df9b (diff) | |
| parent | e659fbfbf9ec586ea0086a78a7443e77abebf1ab (diff) | |
| download | pleroma-b9a87b1baa0650bfb4b699054304daae585a0e9a.tar.gz pleroma-b9a87b1baa0650bfb4b699054304daae585a0e9a.zip | |
Merge branch 'develop' into feature/custom-runtime-modules
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 a9bc1b0aa..5839cbe4a 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 6f6ab733e..5c66a36f1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -97,8 +97,6 @@ config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock config :pleroma, :modules, runtime_dir: "test/fixtures/modules" -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |