diff options
| author | lain <lain@soykaf.club> | 2021-02-23 13:53:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-02-23 13:53:59 +0000 |
| commit | 022eb2a302356b9a8fc51c9db3df12ead6696ee1 (patch) | |
| tree | 4df66f351e238ce60cab54d2017e4a87849f477e | |
| parent | 484ba5d062d93fd0cf4841e7743724928af5a2d9 (diff) | |
| parent | db7d6f337f971707424c103bbb919822d7218527 (diff) | |
| download | pleroma-022eb2a302356b9a8fc51c9db3df12ead6696ee1.tar.gz | |
Merge branch 'chore/no-activitypub-sleeps' into 'develop'
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
See merge request pleroma/pleroma!3330
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 690c98e40..87396a88d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -38,7 +38,7 @@ config :pleroma, :instance, external_user_synchronization: false, static_dir: "test/instance_static/" -config :pleroma, :activitypub, sign_object_fetches: false +config :pleroma, :activitypub, sign_object_fetches: false, follow_handshake_timeout: 0 # Configure your database config :pleroma, Pleroma.Repo, |