diff options
| author | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
| commit | fee0c6a2cb058282ee6c3960730201f58b691270 (patch) | |
| tree | 9a5e0057d20651fbde1fe8180cabf7744a3a26ca /config | |
| parent | 7b44605cb89943a905f6a0a7aab9ebeea58aa7ab (diff) | |
| parent | 7a03b112f2ae0acbb546975a3cb57f63ab69708d (diff) | |
| download | pleroma-fee0c6a2cb058282ee6c3960730201f58b691270.tar.gz pleroma-fee0c6a2cb058282ee6c3960730201f58b691270.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
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 |