diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-13 01:51:52 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-13 01:51:52 +0700 |
| commit | 7528322f83d5bee92a030e2e626436dab327df9b (patch) | |
| tree | d3a69eec557a563ce89246c886e9c31687c8debf /config/test.exs | |
| parent | c6f2735ffa1db7871bcb56c00b6d19e4de346d18 (diff) | |
| parent | 2f31cef71f377cf660f818e7e204436f2070bd78 (diff) | |
| download | pleroma-7528322f83d5bee92a030e2e626436dab327df9b.tar.gz pleroma-7528322f83d5bee92a030e2e626436dab327df9b.zip | |
Merge branch 'develop' into feature/custom-runtime-modules
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 8b9bf5c77..6f6ab733e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -68,7 +68,9 @@ config :pleroma, Oban, queues: false, prune: :disabled -config :pleroma, Pleroma.Scheduler, jobs: [] +config :pleroma, Pleroma.Scheduler, + jobs: [], + global: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, @@ -95,6 +97,8 @@ 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 |