diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-11 02:38:13 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-11 02:38:13 +0000 |
| commit | e343e4ff914d98e1ce9b5aa30185a4afd907e1b6 (patch) | |
| tree | 502d1c0032ffa9cccf675fde87897d54c916a1a6 | |
| parent | f2d72b1fe41088b1dfcc7c6423d9edf317544ab7 (diff) | |
| parent | 76fc4c92bb39dd5d6f4349482cb57419c0f0f93e (diff) | |
| download | pleroma-e343e4ff914d98e1ce9b5aa30185a4afd907e1b6.tar.gz | |
Merge branch 'change-containment-default' into 'develop'
Configuration: Skip thread containment by default
See merge request pleroma/pleroma!1256
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dafa0df5..9220b66bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer +- Thread containment / test for complete visibility will be skipped by default. - Enforcement of OAuth scopes - Add multiple use/time expiring invite token - Restyled OAuth pages to fit with Pleroma's default theme diff --git a/config/config.exs b/config/config.exs index c6bf71fc8..95a0e9972 100644 --- a/config/config.exs +++ b/config/config.exs @@ -244,7 +244,7 @@ config :pleroma, :instance, safe_dm_mentions: false, healthcheck: false, remote_post_retention_days: 90, - skip_thread_containment: false, + skip_thread_containment: true, limit_unauthenticated_to_local_content: true config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800 diff --git a/config/test.exs b/config/test.exs index 7861b9598..6d4fcf7d0 100644 --- a/config/test.exs +++ b/config/test.exs @@ -27,7 +27,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test config :pleroma, :instance, email: "admin@example.com", - notify_email: "noreply@example.com" + notify_email: "noreply@example.com", + skip_thread_containment: false # Configure your database config :pleroma, Pleroma.Repo, |