summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-07-09 16:54:14 +0000
committerkaniini <nenolod@gmail.com>2019-07-09 16:54:14 +0000
commitb6fd16d0a424f916b7338237a2972e595e404955 (patch)
tree3d5b7c516921b4fdcf50ffb71382e49d1474eb66 /config
parent1179a135333aa59e7fa4f5b908e1db8257b994f5 (diff)
parent4e6e5d80428a40f0403560b3c8381ea48cf4373e (diff)
downloadpleroma-b6fd16d0a424f916b7338237a2972e595e404955.tar.gz
pleroma-b6fd16d0a424f916b7338237a2972e595e404955.zip
Merge branch 'test-coverage' into 'develop'
reverse proxy tests See merge request pleroma/pleroma!1385
Diffstat (limited to 'config')
-rw-r--r--config/test.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs
index 012021f2a..63443dde0 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -75,6 +75,8 @@ rum_enabled = System.get_env("RUM_ENABLED") == "true"
config :pleroma, :database, rum_enabled: rum_enabled
IO.puts("RUM enabled: #{rum_enabled}")
+config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
+
try do
import_config "test.secret.exs"
rescue