diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-25 06:12:29 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-25 06:12:29 +0000 |
| commit | dfc96f222cc65eda92e5696a2fc2d6d926f960ed (patch) | |
| tree | d4e9c57c4005af7348b11795834d2993585708c1 /config/config.exs | |
| parent | 92135d00fc6a9dcdeda32a55ac7a88353b7f96f2 (diff) | |
| parent | ea214b8ba65c0911aed6d2b019465272fc77fbc4 (diff) | |
| download | pleroma-dfc96f222cc65eda92e5696a2fc2d6d926f960ed.tar.gz pleroma-dfc96f222cc65eda92e5696a2fc2d6d926f960ed.zip | |
Merge branch 'feature/configurable-blocks' into 'develop'
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index e180cc302..cf6cbaa9d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -58,7 +58,12 @@ config :pleroma, :instance, public: true, quarantined_instances: [] -config :pleroma, :activitypub, accept_blocks: true +config :pleroma, :activitypub, + accept_blocks: true, + unfollow_blocked: true, + outgoing_blocks: true + +config :pleroma, :user, deny_follow_blocked: true config :pleroma, :mrf_rejectnonpublic, allow_followersonly: false, |