diff options
author | rinpatch <rinpatch@sdf.org> | 2019-12-21 11:56:24 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-12-21 11:56:24 +0000 |
commit | c51e93978ea2aa0f2d5bcc43bf7c925b2590eece (patch) | |
tree | a914a0129fcd6e42c2317254cec7411ec5045696 /config/test.exs | |
parent | 7447c80e33a7d54c3d9f03f5c0be3fb738f1318b (diff) | |
parent | b9a87b1baa0650bfb4b699054304daae585a0e9a (diff) | |
download | pleroma-c51e93978ea2aa0f2d5bcc43bf7c925b2590eece.tar.gz pleroma-c51e93978ea2aa0f2d5bcc43bf7c925b2590eece.zip |
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
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 |