diff options
| author | lain <lain@soykaf.club> | 2021-01-05 12:19:39 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 12:19:39 +0100 |
| commit | bea69853a234589b48e492b15ddb2449ec61b661 (patch) | |
| tree | f5f006864a9d70bc9be0dd28bf2bc0893fb97f3e /config | |
| parent | 0ec7e9b8e98f6310f19d0b0a6ad82fc9c70a9d47 (diff) | |
| parent | b3c36d3f7a637973ab9a16dca03eac763a5ccc68 (diff) | |
| download | pleroma-bea69853a234589b48e492b15ddb2449ec61b661.tar.gz pleroma-bea69853a234589b48e492b15ddb2449ec61b661.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
Diffstat (limited to 'config')
| -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 |