Merge remote-tracking branch 'origin/develop' into notice-routes

diff --cc CHANGELOG.md
index 625cf3266fc09928de74eca08871aeca2f2d5df6,8e97da1896ab9467f0bf9637588821c2c6d1b536..ee9e0456854b4165975101152bc557a7a0a7b16e
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,10 -6,55 +6,56 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
+ ### Removed
+ 
+ - MastoFE
+ 
+ ### Changed
+ - Allow users to remove their emails if instance does not need email to register
+ 
+ ### Added
+ - `activeMonth` and `activeHalfyear` fields in NodeInfo usage.users object
+ 
+ ### Fixed
+ - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
+ - Handle Reject for already-accepted Follows properly
++- Display OpenGraph data on alternative notice routes.
+ 
+ ### Removed
+ 
+ ## 2.4.1 - 2021-08-29
+ 
  ### Changed
+ - Make `mix pleroma.database set_text_search_config` run concurrently and indefinitely
  
+ ### Added
+ - AdminAPI: Missing configuration description for StealEmojiPolicy
+ 
+ ### Fixed
+ - MastodonAPI: Stream out Create activities
+ - MRF ObjectAgePolicy: Fix pattern matching on "published"
+ - TwitterAPI: Make `change_password` and `change_email` require params on body instead of query
+ - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
+ - AdminAPI: Fix rendering reports containing a `nil` object
+ - Mastodon API: Activity Search fallbacks on status fetching after a DB Timeout/Error
+ - Mastodon API: Fix crash in Streamer related to reblogging
+ - AdminAPI: List available frontends when `static/frontends` folder is missing
+ - Make activity search properly use language-aware GIN indexes
+ - AdminAPI: Fix suggestions for MRF Policies
+ 
+ ## 2.4.0 - 2021-08-08
+ 
+ ### Changed
+ 
+ - **Breaking:** Configuration: `:chat, enabled` moved to `:shout, enabled` and `:instance, chat_limit` moved to `:shout, limit`
+ - **Breaking** Entries for simple_policy, transparency_exclusions and quarantined_instances now list both the instance and a reason.
+ - Support for Erlang/OTP 24
  - The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
  - HTTPSecurityPlug now sends a response header to opt out of Google's FLoC (Federated Learning of Cohorts) targeted advertising.
+ - Email address is now returned if requesting user is the owner of the user account so it can be exposed in client and FE user settings UIs.
+ - Improved Twittercard and OpenGraph meta tag generation including thumbnails and image dimension metadata when available.
+ - AdminAPI: sort users so the newest are at the top.
+ - ActivityPub Client-to-Server(C2S): Limitation on the type of Activity/Object are lifted as they are now passed through ObjectValidators
  
  ### Added
  

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/static_fe/static_fe_controller.ex
Simple merge

diff --cc test/pleroma/web/o_status/o_status_controller_test.exs
Simple merge

diff --cc test/pleroma/web/plugs/frontend_static_plug_test.exs
Simple merge