Merge remote-tracking branch 'upstream/develop' into accept-deletes

diff --cc CHANGELOG.md
index cd2536f9eca2239b8d91eba453965bc795b04115,e454bd9d106f493e5de6350884c856c474acf768..2d8e7efc3f921d47b5584c3e6d90377123fa576e
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -12,8 +12,9 @@@ The format is based on [Keep a Changelo
  - NodeInfo: `pleroma_emoji_reactions` to the `features` list.
  - Configuration: `:restrict_unauthenticated` setting, restrict access for unauthenticated users to timelines (public and federate), user profiles and statuses.
  - New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
+ - Mix task to create trusted OAuth App.
+ - Notifications: Added `follow_request` notification type (configurable, see `[:notifications, :enable_follow_request_notifications]` setting).
 +- Added `:reject_deletes` group to SimplePolicy
  <details>
    <summary>API Changes</summary>
  - Mastodon API: Support for `include_types` in `/api/v1/notifications`.
@@@ -21,9 -23,19 +24,20 @@@
  
  ### Fixed
  - Support pagination in conversations API
 +- **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again
  
  ## [unreleased-patch]
+ ### Fixed
+ - Logger configuration through AdminFE
+ - HTTP Basic Authentication permissions issue
+ - ObjectAgePolicy didn't filter out old messages
+ 
+ ### Added
+ - NodeInfo: ObjectAgePolicy settings to the `federation` list.
+ <details>
+   <summary>API Changes</summary>
+ - Admin API: `GET /api/pleroma/admin/need_reboot`.
+ </details>
  
  ## [2.0.2] - 2020-04-08
  ### Added

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/mrf.md
index 2eb9631bd8e397bd1ad9fa6bd43ed77662987f82,3fcae07616a9d5f94584f8049c3a48ad8a173031..d48d0cc991abd89db3e99079ebed96fd46cd976f
--- 1/docs/configuration/mrf.md
--- 2/docs/configuration/mrf.md
+++ b/docs/configuration/mrf.md
@@@ -41,12 -41,14 +41,15 @@@ config :pleroma, :instance
  
  Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_simple` config object. These groups are:
  
- * `media_removal`: Servers in this group will have media stripped from incoming messages.
+ * `reject`: Servers in this group will have their messages rejected.
+ * `accept`: If not empty, only messages from these instances will be accepted (whitelist federation).
  * `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media.
- * `reject`: Servers in this group will have their messages (except deletions) rejected.
- * `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields.
+ * `media_removal`: Servers in this group will have media stripped from incoming messages.
+ * `avatar_removal`: Avatars from these servers will be stripped from incoming messages.
+ * `banner_removal`: Banner images from these servers will be stripped from incoming messages.
  * `report_removal`: Servers in this group will have their reports (flags) rejected.
+ * `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields.
 +* `reject_deletes`: Deletion requests will be rejected from these servers.
  
  Servers should be configured as lists.