diff options
| author | lain <lain@soykaf.club> | 2021-01-05 12:42:30 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 12:42:30 +0100 |
| commit | f0e6cff58365791f3bfa79117351ee2e705d1b6b (patch) | |
| tree | b803125707e627f86f941f66cc3f2810dc063c0a /config/test.exs | |
| parent | 4200a063408966b1e14e79b18c96ce59af23ec35 (diff) | |
| parent | ca7cf62d2aae25c3a299181baa3a8f389dfd1858 (diff) | |
| download | pleroma-f0e6cff58365791f3bfa79117351ee2e705d1b6b.tar.gz pleroma-f0e6cff58365791f3bfa79117351ee2e705d1b6b.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index a85881592..7fc457463 100644 --- a/config/test.exs +++ b/config/test.exs @@ -134,6 +134,10 @@ config :pleroma, :pipeline, config :pleroma, :cachex, provider: Pleroma.CachexMock +config :pleroma, :side_effects, + ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock, + logger: Pleroma.LoggerMock + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |