diff options
| author | feld <feld@feld.me> | 2020-04-01 17:05:09 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-04-01 17:05:09 +0000 |
| commit | ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (patch) | |
| tree | 2058bf1189b7a7ba12b1a160c27a9e92f3fa28bb /config/test.exs | |
| parent | bfec45bf740f9fcfcea92bbded6bd2c146dc64c1 (diff) | |
| parent | 1fcdcb12a717fa3dbd54a5c3778bd216df6449ad (diff) | |
| download | pleroma-ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc.tar.gz pleroma-ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc.zip | |
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
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 |