hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/custom-runtime-modules

Browse source
This commit is contained in:
Egor Kislitsyn 2019-12-13 01:51:52 +07:00
commit 7528322f83
69 changed files with 1129 additions and 1264 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/test.exs
View file

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