From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 23 Jun 2020 16:38:27 +0000 (+0000)
Subject: Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c7d69e925664ce7125c3938c298d72e94a2a1349;p=akkoma

Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'

Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
---

c7d69e925664ce7125c3938c298d72e94a2a1349
diff --cc CHANGELOG.md
index ffd43642a,fab87b569..7fc2231d1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,11 -6,10 +6,13 @@@ The format is based on [Keep a Changelo
  ## [unreleased]
  
  ### Changed
 +- **Breaking:** Elixir >=1.9 is now required (was >= 1.8)
 +- In Conversations, return only direct messages as `last_status`
 +- Using the `only_media` filter on timelines will now exclude reblog media
  - MFR policy to set global expiration for all local Create activities
  - OGP rich media parser merged with TwitterCard
+ - Configuration: `:instance, rewrite_policy` moved to `:mrf, policies`, `:instance, :mrf_transparency` moved to `:mrf, :transparency`, `:instance, :mrf_transparency_exclusions` moved to `:mrf, :transparency_exclusions`. Old config namespace is deprecated.
+ 
  <details>
    <summary>API Changes</summary>
  - **Breaking:** Emoji API: changed methods and renamed routes.