Merge remote-tracking branch 'upstream/develop' into registration-workflow

diff --cc CHANGELOG.md
index f61ccd2c3df529b35166fe746e7ad79db336d9d4,281f067294eaed80d40ae58bb50299da54d6ffcd..a402b80ff3d30d83b3c2ac77c78123396bb7c862
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,20 -6,68 +6,69 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
+ ### Changed
+ 
+ - Polls now always return a `voters_count`, even if they are single-choice.
+ - Admin Emails: The ap id is used as the user link in emails now.
++- **Breaking:** Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
+ 
  ### Added
- - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
- - Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
- - Mix task option for force-unfollowing relays
- - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
+ 
  - Reports now generate notifications for admins and mods.
- - Pleroma API: Importing the mutes users from CSV files.
  - Experimental websocket-based federation between Pleroma instances.
- - Support pagination of blocks and mutes
- - App metrics: ability to restrict access to specified IP whitelist.
- - Account backup
+ - Support for local-only statuses
+ - Support pagination of blocks and mutes.
+ - Account backup.
  - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
- - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`
+ - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
  - The site title is now injected as a `title` tag like preloads or metadata.
+ - Password reset tokens now are not accepted after a certain age.
+ 
+ <details>
+   <summary>API Changes</summary>
+ - Admin API: (`GET /api/pleroma/admin/users`) filter users by `unconfirmed` status and `actor_type`.
+ - Pleroma API: Add `idempotency_key` to the chat message entity that can be used for optimistic message sending.
+ - Pleroma API: (`GET /api/v1/pleroma/federation_status`) Add a way to get a list of unreachable instances.
+ - Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
+ - Admin API: An endpoint to manage frontends
+ 
+ </details>
+ 
+ ### Fixed
+ 
+ - Users with `is_discoverable` field set to false (default value) will appear in in-service search results but be hidden from external services (search bots etc.).
+ 
+ <details>
+   <summary>API Changes</summary>
+   - Mastodon API: Current user is now included in conversation if it's the only participant.
+   - Mastodon API: Fixed last_status.account being not filled with account data.
+ </details>
+ 
+ ## Unreleased (Patch)
+ 
+ ### Changed
+ 
+ ### Fixed
+ 
+ - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
+ - Search: RUM index search speed has been fixed.
+ - S3 Uploads with Elixir 1.11.
+ - Emoji Reaction activity filtering from blocked and muted accounts.
+ - Mix task pleroma.user delete_activities for source installations.
+ - Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention
+ - Forwarded reports duplication from Pleroma instances.
+ 
+ <details>
+   <summary>API</summary>
+ - Statuses were not displayed for Mastodon forwarded reports.
+ 
+ </details>
+ 
+ ## [2.2.0] - 2020-11-12
+ 
+ ### Security
+ 
+ - Fixed the possibility of using file uploads to spoof posts.
  
  ### Changed
  

diff --cc lib/pleroma/user.ex
Simple merge