summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-04-02 14:47:17 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-04-02 14:47:17 +0300
commitdbcfac11b45b367185a3b18a2db3e3fb07e8f20d (patch)
tree039254a94616f04f4ea00e893bf0fb66dc06d9e8 /config/test.exs
parentdfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (diff)
parentfd932b14a7e7335a91a2acc2d6dd6fba7e2e90b3 (diff)
downloadpleroma-dbcfac11b45b367185a3b18a2db3e3fb07e8f20d.tar.gz
pleroma-dbcfac11b45b367185a3b18a2db3e3fb07e8f20d.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs
index b8ea63c94..040e67e4a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -90,6 +90,8 @@ config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
+config :pleroma, Pleroma.Gun, Pleroma.GunMock
+
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false