diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
| commit | 95c085174dc523f2898f02120d7ff0b120930d91 (patch) | |
| tree | 101ab8c43a0886b76a574478624058e2c0a29704 /config | |
| parent | 376a55c97fcf178abec3091db830215642bf23c1 (diff) | |
| parent | abe2e8881f946aafc2012edd43373c22837387af (diff) | |
| download | pleroma-95c085174dc523f2898f02120d7ff0b120930d91.tar.gz pleroma-95c085174dc523f2898f02120d7ff0b120930d91.zip | |
Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 9d441a7f5..012021f2a 100644 --- a/config/test.exs +++ b/config/test.exs @@ -28,7 +28,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test config :pleroma, :instance, email: "admin@example.com", notify_email: "noreply@example.com", - skip_thread_containment: false + skip_thread_containment: false, + federating: false # Configure your database config :pleroma, Pleroma.Repo, |