From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Thu, 4 Feb 2021 14:26:03 +0000 (+0000)
Subject: Merge branch 'bugfix/notice-external-redirect' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ea5469961a537d12ca799bf7470e53cb636b1439;hp=-c;p=akkoma

Merge branch 'bugfix/notice-external-redirect' into 'develop'

Redirect non-local activities when /notice/:id is used

See merge request pleroma/pleroma!3300
---

ea5469961a537d12ca799bf7470e53cb636b1439
diff --combined CHANGELOG.md
index 47009abc9,e9dfac97e..1dbdb3f4e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,27 -10,20 +10,28 @@@ The format is based on [Keep a Changelo
  
  - **Breaking**: Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
  - **Breaking**: Changed `mix pleroma.user toggle_activated` to `mix pleroma.user activate/deactivate`
 -- **Breaking**: AdminAPI changed User field `confirmation_pending` to `is_confirmed`
 -- **Breaking**: AdminAPI changed User field `approval_pending` to `is_approved`
 -- **Breaking**: AdminAPI changed User field `deactivated` to `is_active`
  - 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.
  - Improved registration workflow for email confirmation and account approval modes.
  - Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
  - Emoji: Support the full Unicode 13.1 set of Emoji for reactions, plus regional indicators.
 -- Admin API: Reports now ordered by newest
  - Deprecated `Pleroma.Uploaders.S3, :public_endpoint`. Now `Pleroma.Upload, :base_url` is the standard configuration key for all uploaders.
  - Improved Apache webserver support: updated sample configuration, MediaProxy cache invalidation verified with the included sample script
  - Improve OAuth 2.0 provider support. A missing `fqn` field was added to the response, but does not expose the user's email address.
+ - Provide redirect of external posts from `/notice/:id` to their original URL
  
 +<details>
 +  <summary>API Changes</summary>
 +
 +- **Breaking:** AdminAPI changed User field `confirmation_pending` to `is_confirmed`
 +- **Breaking:** AdminAPI changed User field `approval_pending` to `is_approved`
 +- **Breaking**: AdminAPI changed User field `deactivated` to `is_active`
 +- **Breaking:** AdminAPI `GET /api/pleroma/admin/users/:nickname_or_id/statuses` changed response format and added the number of total users posts.
 +- **Breaking:** AdminAPI `GET /api/pleroma/admin/instances/:instance/statuses` changed response format and added the number of total users posts.
 +- Admin API: Reports now ordered by newest
 +
 +</details>
 +
  ### Added
  
  - Reports now generate notifications for admins and mods.
@@@ -80,8 -73,6 +81,8 @@@
    - Mastodon API: Fixed last_status.account being not filled with account data.
    - Mastodon API: Fix not being able to add or remove multiple users at once in lists.
    - Mastodon API: Fixed own_votes being not returned with poll data.
 +  - Mastodon API: Fixed creation of scheduled posts with polls.
 +  - Mastodon API: Support for expires_in/expires_at in the Filters.
  </details>
  
  ## Unreleased (Patch)