diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
| commit | 5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3 (patch) | |
| tree | 6677ba80418ffd34a78cba75498f2c1ab48ba14c /config/test.exs | |
| parent | 45180d4c6058f790475d8ff28018c912db105082 (diff) | |
| parent | 946de2299cccebac6718e3a132397ff5c06c67ee (diff) | |
| download | pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.tar.gz pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.zip | |
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index d52ced612..5c66a36f1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -95,6 +95,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, :modules, runtime_dir: "test/fixtures/modules" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |