summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-02 11:23:07 +0000
committerlain <lain@soykaf.club>2019-08-02 11:23:07 +0000
commit5ff8f07ca906d77a6ec1d5ba912a787f855364f9 (patch)
treeff047fd71408e947b91ce9a44fe3fb026e7c684f /config
parent1fe092e03cab11a08e5a15d6bbaf0fd603ef4a00 (diff)
parent301ea0dc0466371032f44f3e936d1b951ed9784c (diff)
downloadpleroma-5ff8f07ca906d77a6ec1d5ba912a787f855364f9.tar.gz
pleroma-5ff8f07ca906d77a6ec1d5ba912a787f855364f9.zip
Merge branch 'feature/hide-follows-remote' into 'develop'
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411
Diffstat (limited to 'config')
-rw-r--r--config/test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 92dca18bc..aded8600d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -29,7 +29,8 @@ config :pleroma, :instance,
email: "admin@example.com",
notify_email: "noreply@example.com",
skip_thread_containment: false,
- federating: false
+ federating: false,
+ external_user_synchronization: false
config :pleroma, :activitypub, sign_object_fetches: false