diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
| commit | 7f692343c80ddf353712490edfbcdb14866f5685 (patch) | |
| tree | 7ef90078d87fafb1eb25986c92af17a9eede37be /config/test.exs | |
| parent | fc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-7f692343c80ddf353712490edfbcdb14866f5685.tar.gz pleroma-7f692343c80ddf353712490edfbcdb14866f5685.zip | |
Merge branch 'develop' into global-status-expiration
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 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 |