Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into tusooa/extract-fix

155 files changed, 91 insertions, 23 deletions

diff --git a/changelog.d/2023-06-deps-update.skip b/changelog.d/2.6.0-mergeback.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/2023-06-deps-update.skip
+++ b/changelog.d/2.6.0-mergeback.skip
diff --git a/changelog.d/3739.skip b/changelog.d/2.6.1-mergeback.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3739.skip
+++ b/changelog.d/2.6.1-mergeback.skip
diff --git a/changelog.d/3126.fix b/changelog.d/3126.fix
deleted file mode 100644
index 91d396c89..000000000
--- a/changelog.d/3126.fix
+++ /dev/null
@@ -1 +0,0 @@
-MediaProxy responses now return a sandbox CSP header
diff --git a/changelog.d/3848.add b/changelog.d/3848.add
deleted file mode 100644
index d7b1b0a84..000000000
--- a/changelog.d/3848.add
+++ /dev/null
@@ -1 +0,0 @@
-Add OAuth scope descriptions
diff --git a/changelog.d/3872.remove b/changelog.d/3872.remove
deleted file mode 100644
index 54cbb660e..000000000
--- a/changelog.d/3872.remove
+++ /dev/null
@@ -1 +0,0 @@
-remove BBS/SSH feature, replaced by an external bridge.
\ No newline at end of file
diff --git a/changelog.d/3873.fix b/changelog.d/3873.fix
deleted file mode 100644
index 4699f7b58..000000000
--- a/changelog.d/3873.fix
+++ /dev/null
@@ -1 +0,0 @@
-UploadedMedia: Add missing disposition_type to Content-Disposition
\ No newline at end of file
diff --git a/changelog.d/3874.remove b/changelog.d/3874.remove
deleted file mode 100644
index a81f744bf..000000000
--- a/changelog.d/3874.remove
+++ /dev/null
@@ -1 +0,0 @@
-Remove a few unused indexes.
diff --git a/changelog.d/3880.remove b/changelog.d/3880.remove
deleted file mode 100644
index 113c76c85..000000000
--- a/changelog.d/3880.remove
+++ /dev/null
@@ -1 +0,0 @@
-Cleanup OStatus-era user upgrades and ap_enabled indicator
\ No newline at end of file
diff --git a/changelog.d/3882.add b/changelog.d/3882.add
deleted file mode 100644
index 4712de1dc..000000000
--- a/changelog.d/3882.add
+++ /dev/null
@@ -1 +0,0 @@
-Allow lang attribute in status text
diff --git a/changelog.d/3883.fix b/changelog.d/3883.fix
deleted file mode 100644
index 6824f2013..000000000
--- a/changelog.d/3883.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix abnormal behaviour when refetching a poll
diff --git a/changelog.d/3884.fix b/changelog.d/3884.fix
deleted file mode 100644
index f8dbb2bbf..000000000
--- a/changelog.d/3884.fix
+++ /dev/null
@@ -1 +0,0 @@
-Allow non-HTTP(s) URIs in "url" fields for compatibility with "FEP-fffd: Proxy Objects"
\ No newline at end of file
diff --git a/changelog.d/3885.fix b/changelog.d/3885.fix
deleted file mode 100644
index c5fbb0ed4..000000000
--- a/changelog.d/3885.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix opengraph and twitter card meta tags
diff --git a/changelog.d/3888.fix b/changelog.d/3888.fix
deleted file mode 100644
index 886aa7b39..000000000
--- a/changelog.d/3888.fix
+++ /dev/null
@@ -1 +0,0 @@
-ForceMentionsInContent: fix double mentions for Mastodon/Misskey posts
\ No newline at end of file
diff --git a/changelog.d/3891.fix b/changelog.d/3891.fix
deleted file mode 100644
index f1fb62d82..000000000
--- a/changelog.d/3891.fix
+++ /dev/null
@@ -1 +0,0 @@
-OEmbed HTML tags are now filtered
diff --git a/changelog.d/3897.add b/changelog.d/3897.add
deleted file mode 100644
index 5c4402f45..000000000
--- a/changelog.d/3897.add
+++ /dev/null
@@ -1 +0,0 @@
-OnlyMedia Upload Filter
diff --git a/changelog.d/3900.change b/changelog.d/3900.change
new file mode 100644
index 000000000..fe0cc2fbf
--- /dev/null
+++ b/changelog.d/3900.change
@@ -0,0 +1 @@
+Update to Phoenix 1.7
diff --git a/changelog.d/3901.security b/changelog.d/3901.security
deleted file mode 100644
index a3d8bd01f..000000000
--- a/changelog.d/3901.security
+++ /dev/null
@@ -1 +0,0 @@
-Preload: Make generated JSON html-safe. It already was html safe because it only consists of config data that is base64 encoded, but this will keep it safe it that ever changes.
diff --git a/changelog.d/3987.fix b/changelog.d/3987.fix
new file mode 100644
index 000000000..5d578cc09
--- /dev/null
+++ b/changelog.d/3987.fix
@@ -0,0 +1 @@
+Remove checking ImageMagick's commands for Pleroma.Upload.Filter.AnalyzeMetadata
diff --git a/changelog.d/account-rendering-auth-check.fix b/changelog.d/account-rendering-auth-check.fix
new file mode 100644
index 000000000..12f68e454
--- /dev/null
+++ b/changelog.d/account-rendering-auth-check.fix
@@ -0,0 +1 @@
+Fix authentication check on account rendering when bio is defined
diff --git a/changelog.d/add-ipfs-upload.add b/changelog.d/add-ipfs-upload.add
new file mode 100644
index 000000000..0cd1f2858
--- /dev/null
+++ b/changelog.d/add-ipfs-upload.add
@@ -0,0 +1 @@
+Uploader: Add support for uploading attachments using IPFS
diff --git a/changelog.d/add-nsfw-mrf.add b/changelog.d/add-nsfw-mrf.add
new file mode 100644
index 000000000..ce62c7ed0
--- /dev/null
+++ b/changelog.d/add-nsfw-mrf.add
@@ -0,0 +1 @@
+Add NSFW-detecting MRF
diff --git a/changelog.d/add-outbox.fix b/changelog.d/add-outbox.fix
new file mode 100644
index 000000000..f3de5338d
--- /dev/null
+++ b/changelog.d/add-outbox.fix
@@ -0,0 +1 @@
+ap userview: add outbox field.
diff --git a/changelog.d/anonymous-exception-else.fix b/changelog.d/anonymous-exception-else.fix
new file mode 100644
index 000000000..38d5d1be5
--- /dev/null
+++ b/changelog.d/anonymous-exception-else.fix
@@ -0,0 +1 @@
+Fix #strip_report_status_data
diff --git a/changelog.d/3831.skip b/changelog.d/api-docs-2.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3831.skip
+++ b/changelog.d/api-docs-2.skip
diff --git a/changelog.d/3870.skip b/changelog.d/api-docs.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3870.skip
+++ b/changelog.d/api-docs.skip
diff --git a/changelog.d/3876.skip b/changelog.d/atom-leak.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3876.skip
+++ b/changelog.d/atom-leak.skip
diff --git a/changelog.d/authorize-interaction.add b/changelog.d/authorize-interaction.add
new file mode 100644
index 000000000..8692209e1
--- /dev/null
+++ b/changelog.d/authorize-interaction.add
@@ -0,0 +1 @@
+Support /authorize-interaction route used by Mastodon
\ No newline at end of file
diff --git a/changelog.d/backups-follows.add b/changelog.d/backups-follows.add
new file mode 100644
index 000000000..a55c436f6
--- /dev/null
+++ b/changelog.d/backups-follows.add
@@ -0,0 +1 @@
+Include following/followers in backups
\ No newline at end of file
diff --git a/changelog.d/bad_inbox_request.change b/changelog.d/bad_inbox_request.change
new file mode 100644
index 000000000..b81f60638
--- /dev/null
+++ b/changelog.d/bad_inbox_request.change
@@ -0,0 +1 @@
+Invalid activities delivered to the inbox will be rejected with a 400 Bad Request
diff --git a/changelog.d/bandit.change b/changelog.d/bandit.change
new file mode 100644
index 000000000..7a1104314
--- /dev/null
+++ b/changelog.d/bandit.change
@@ -0,0 +1 @@
+Support Bandit as an alternative to Cowboy for the HTTP server. 
diff --git a/changelog.d/3877.skip b/changelog.d/bare_uri_test.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3877.skip
+++ b/changelog.d/bare_uri_test.skip
diff --git a/changelog.d/3878.skip b/changelog.d/benchee.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3878.skip
+++ b/changelog.d/benchee.skip
diff --git a/changelog.d/blurhash.change b/changelog.d/blurhash.change
new file mode 100644
index 000000000..4276eb164
--- /dev/null
+++ b/changelog.d/blurhash.change
@@ -0,0 +1 @@
+Replace eblurhash with rinpatch_blurhash. This also removes a dependency on ImageMagick.
diff --git a/changelog.d/bookmark-folders.add b/changelog.d/bookmark-folders.add
new file mode 100644
index 000000000..d9b03cecc
--- /dev/null
+++ b/changelog.d/bookmark-folders.add
@@ -0,0 +1 @@
+Allow to group bookmarks in folders
\ No newline at end of file
diff --git a/changelog.d/3893.skip b/changelog.d/bookmark-folders.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3893.skip
+++ b/changelog.d/bookmark-folders.skip
diff --git a/changelog.d/bugfix-ccworks.fix b/changelog.d/bugfix-ccworks.fix
new file mode 100644
index 000000000..658e27b86
--- /dev/null
+++ b/changelog.d/bugfix-ccworks.fix
@@ -0,0 +1 @@
+Fix federation with Convergence AP Bridge
\ No newline at end of file
diff --git a/changelog.d/3899.skip b/changelog.d/build-release-with-local-libvips.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3899.skip
+++ b/changelog.d/build-release-with-local-libvips.skip
diff --git a/changelog.d/bump-elixir.change b/changelog.d/bump-elixir.change
new file mode 100644
index 000000000..afb25d4e7
--- /dev/null
+++ b/changelog.d/bump-elixir.change
@@ -0,0 +1 @@
+Elixir 1.13 is the minimum required version.
diff --git a/changelog.d/card-endpoint.remove b/changelog.d/card-endpoint.remove
new file mode 100644
index 000000000..e09a24cf7
--- /dev/null
+++ b/changelog.d/card-endpoint.remove
@@ -0,0 +1 @@
+Mastodon API: Remove deprecated GET /api/v1/statuses/:id/card endpoint https://github.com/mastodon/mastodon/pull/11213
diff --git a/changelog.d/card-image-description.add b/changelog.d/card-image-description.add
new file mode 100644
index 000000000..bf423ebb8
--- /dev/null
+++ b/changelog.d/card-image-description.add
@@ -0,0 +1 @@
+Include image description in status media cards
\ No newline at end of file
diff --git a/changelog.d/chat-attachment-empty-array.fix b/changelog.d/chat-attachment-empty-array.fix
new file mode 100644
index 000000000..7d98c9dd2
--- /dev/null
+++ b/changelog.d/chat-attachment-empty-array.fix
@@ -0,0 +1 @@
+ChatMessage: Tolerate attachment field set to an empty array
diff --git a/changelog.d/config-stat-symlink.fix b/changelog.d/config-stat-symlink.fix
new file mode 100644
index 000000000..c8b98225d
--- /dev/null
+++ b/changelog.d/config-stat-symlink.fix
@@ -0,0 +1 @@
+- Config: Check the permissions of the linked file instead of the symlink
diff --git a/changelog.d/content-length.fix b/changelog.d/content-length.fix
new file mode 100644
index 000000000..dee906a9d
--- /dev/null
+++ b/changelog.d/content-length.fix
@@ -0,0 +1 @@
+MediaProxy was setting the content-length header which is not permitted by RFC9112§6.2 when we are chunking the reply as it conflicts with the existence of the transfer-encoding header.
diff --git a/changelog.d/delete-status-of-banned-user.fix b/changelog.d/delete-status-of-banned-user.fix
deleted file mode 100644
index 1fa6a29d8..000000000
--- a/changelog.d/delete-status-of-banned-user.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error 404 when deleting status of a banned user
diff --git a/changelog.d/deprecate-scrobbles.remove b/changelog.d/deprecate-scrobbles.remove
deleted file mode 100644
index c453a9784..000000000
--- a/changelog.d/deprecate-scrobbles.remove
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate Pleroma's audio scrobbling
diff --git a/changelog.d/deprecations.skip b/changelog.d/deprecations.skip
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/changelog.d/deprecations.skip
@@ -0,0 +1 @@
+
diff --git a/changelog.d/3902.skip b/changelog.d/deprecations2.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3902.skip
+++ b/changelog.d/deprecations2.skip
diff --git a/changelog.d/3909.skip b/changelog.d/deps-bump-2024-01-25.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/3909.skip
+++ b/changelog.d/deps-bump-2024-01-25.skip
diff --git a/changelog.d/amd64-runner.skip b/changelog.d/description-meilisearch-type.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/amd64-runner.skip
+++ b/changelog.d/description-meilisearch-type.skip
diff --git a/changelog.d/changelog-improve.skip b/changelog.d/dialyzer.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/changelog-improve.skip
+++ b/changelog.d/dialyzer.skip
diff --git a/changelog.d/distro-docs-elixir-1.11.skip b/changelog.d/dialyzer2.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/distro-docs-elixir-1.11.skip
+++ b/changelog.d/dialyzer2.skip
diff --git a/changelog.d/gentoo_otp.skip b/changelog.d/dialyzer3.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/gentoo_otp.skip
+++ b/changelog.d/dialyzer3.skip
diff --git a/changelog.d/gentoo_otp_hotfix.skip b/changelog.d/dialyzer4.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/gentoo_otp_hotfix.skip
+++ b/changelog.d/dialyzer4.skip
diff --git a/changelog.d/digest_emails.fix b/changelog.d/digest_emails.fix
new file mode 100644
index 000000000..335a24464
--- /dev/null
+++ b/changelog.d/digest_emails.fix
@@ -0,0 +1 @@
+Fix the processing of email digest jobs.
diff --git a/changelog.d/media-altdomain.skip b/changelog.d/doc-fix.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/media-altdomain.skip
+++ b/changelog.d/doc-fix.skip
diff --git a/changelog.d/docs-max-elixir-erlang.change b/changelog.d/docs-max-elixir-erlang.change
new file mode 100644
index 000000000..a58b7fc17
--- /dev/null
+++ b/changelog.d/docs-max-elixir-erlang.change
@@ -0,0 +1 @@
+- Document maximum supported version of Erlang & Elixir
diff --git a/changelog.d/emoji-download-paginate.fix b/changelog.d/emoji-download-paginate.fix
new file mode 100644
index 000000000..e31a63380
--- /dev/null
+++ b/changelog.d/emoji-download-paginate.fix
@@ -0,0 +1 @@
+When downloading remote emojis packs, account for pagination
\ No newline at end of file
diff --git a/changelog.d/emoji-policy.add b/changelog.d/emoji-policy.add
deleted file mode 100644
index 45510c4f6..000000000
--- a/changelog.d/emoji-policy.add
+++ /dev/null
@@ -1 +0,0 @@
-Implement MRF policy to reject or delist according to emojis
diff --git a/changelog.d/emoji-use-v1.fix b/changelog.d/emoji-use-v1.fix
new file mode 100644
index 000000000..ccc96b377
--- /dev/null
+++ b/changelog.d/emoji-use-v1.fix
@@ -0,0 +1 @@
+Make remote emoji packs API use specifically the V1 URL. Akkoma does not understand it without V1, and it works either way with normal pleroma, so no reason to not do this
\ No newline at end of file
diff --git a/changelog.d/pipeline-triggers.skip b/changelog.d/exile-bsds.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/pipeline-triggers.skip
+++ b/changelog.d/exile-bsds.skip
diff --git a/changelog.d/testfix-system-config-use.skip b/changelog.d/exile-freebsd.skip
index e69de29bb..e69de29bb 100644
--- a/changelog.d/testfix-system-config-use.skip
+++ b/changelog.d/exile-freebsd.skip
diff --git a/changelog.d/exile-macos.skip b/changelog.d/exile-macos.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/exile-macos.skip
diff --git a/changelog.d/exile.skip b/changelog.d/exile.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/exile.skip
diff --git a/changelog.d/familiar-followers.add b/changelog.d/familiar-followers.add
new file mode 100644
index 000000000..6e7ec9d25
--- /dev/null
+++ b/changelog.d/familiar-followers.add
@@ -0,0 +1 @@
+Implement `/api/v1/accounts/familiar_followers`
\ No newline at end of file
diff --git a/changelog.d/favicon.add b/changelog.d/favicon.add
new file mode 100644
index 000000000..cf12395e7
--- /dev/null
+++ b/changelog.d/favicon.add
@@ -0,0 +1 @@
+Add support for configuring favicon, embed favicon and PWA manifest in server-generated meta
diff --git a/changelog.d/featured-collection-shouldnt-break-user-fetch.fix b/changelog.d/featured-collection-shouldnt-break-user-fetch.fix
deleted file mode 100644
index e8ce288cc..000000000
--- a/changelog.d/featured-collection-shouldnt-break-user-fetch.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix user fetch completely broken if featured collection is not in a supported form
diff --git a/changelog.d/federation_status-access.change b/changelog.d/federation_status-access.change
new file mode 100644
index 000000000..952254476
--- /dev/null
+++ b/changelog.d/federation_status-access.change
@@ -0,0 +1 @@
+- Make `/api/v1/pleroma/federation_status` publicly available
diff --git a/changelog.d/federator-modules.remove b/changelog.d/federator-modules.remove
new file mode 100644
index 000000000..6ff71d107
--- /dev/null
+++ b/changelog.d/federator-modules.remove
@@ -0,0 +1 @@
+Removed support for multiple federator modules as we only support ActivityPub
diff --git a/changelog.d/federator.skip b/changelog.d/federator.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/federator.skip
diff --git a/changelog.d/fep-2c59.add b/changelog.d/fep-2c59.add
new file mode 100644
index 000000000..03e33cbd8
--- /dev/null
+++ b/changelog.d/fep-2c59.add
@@ -0,0 +1 @@
+Implement FEP-2c59, add "webfinger" to user actor
\ No newline at end of file
diff --git a/changelog.d/ffmpeg-limiter.add b/changelog.d/ffmpeg-limiter.add
new file mode 100644
index 000000000..e4a5ef196
--- /dev/null
+++ b/changelog.d/ffmpeg-limiter.add
@@ -0,0 +1 @@
+Framegrabs with ffmpeg will execute with a 5 second timeout and cache the URLs of failures with a TTL of 15 minutes to prevent excessive retries.
diff --git a/changelog.d/finch_redirects.fix b/changelog.d/finch_redirects.fix
new file mode 100644
index 000000000..c25beaba4
--- /dev/null
+++ b/changelog.d/finch_redirects.fix
@@ -0,0 +1 @@
+Following HTTP Redirects when the HTTP Adapter is Finch
diff --git a/changelog.d/fix-bookmark-folder-tests.skip b/changelog.d/fix-bookmark-folder-tests.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/fix-bookmark-folder-tests.skip
diff --git a/changelog.d/fix-dockerfile.skip b/changelog.d/fix-dockerfile.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/fix-dockerfile.skip
diff --git a/changelog.d/fix-duplicate-inbox-deliveries.fix b/changelog.d/fix-duplicate-inbox-deliveries.fix
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/fix-duplicate-inbox-deliveries.fix
diff --git a/changelog.d/fix-object-test.fix b/changelog.d/fix-object-test.fix
deleted file mode 100644
index 5eea719f0..000000000
--- a/changelog.d/fix-object-test.fix
+++ /dev/null
@@ -1 +0,0 @@
-Correctly handle the situation when a poll has both "anyOf" and "oneOf" but one of them being empty
diff --git a/changelog.d/fix-otp-comparison.skip b/changelog.d/fix-otp-comparison.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/fix-otp-comparison.skip
diff --git a/changelog.d/fix-tests.skip b/changelog.d/fix-tests.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/fix-tests.skip
diff --git a/changelog.d/fix-webfinger-spoofing.security b/changelog.d/fix-webfinger-spoofing.security
new file mode 100644
index 000000000..7b3c9490a
--- /dev/null
+++ b/changelog.d/fix-webfinger-spoofing.security
@@ -0,0 +1 @@
+Fix webfinger spoofing.
diff --git a/changelog.d/force-mention-mrf.add b/changelog.d/force-mention-mrf.add
new file mode 100644
index 000000000..46ac14244
--- /dev/null
+++ b/changelog.d/force-mention-mrf.add
@@ -0,0 +1 @@
+Add ForceMention MRF
\ No newline at end of file
diff --git a/changelog.d/framegrabs.fix b/changelog.d/framegrabs.fix
new file mode 100644
index 000000000..dc0466f1b
--- /dev/null
+++ b/changelog.d/framegrabs.fix
@@ -0,0 +1 @@
+Video framegrabs were not working correctly after the change to use Exile to execute ffmpeg
diff --git a/changelog.d/frontend-management.add b/changelog.d/frontend-management.add
new file mode 100644
index 000000000..b85cddd96
--- /dev/null
+++ b/changelog.d/frontend-management.add
@@ -0,0 +1 @@
+[docs] add frontends management documentation
diff --git a/changelog.d/generate-unset-user-keys-migration.skip b/changelog.d/generate-unset-user-keys-migration.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/generate-unset-user-keys-migration.skip
diff --git a/changelog.d/group-actor.add b/changelog.d/group-actor.add
new file mode 100644
index 000000000..2f614b3d8
--- /dev/null
+++ b/changelog.d/group-actor.add
@@ -0,0 +1 @@
+Implement group actors
diff --git a/changelog.d/gun-logs.skip b/changelog.d/gun-logs.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/gun-logs.skip
diff --git a/changelog.d/gun_pool.fix b/changelog.d/gun_pool.fix
new file mode 100644
index 000000000..94ec9103d
--- /dev/null
+++ b/changelog.d/gun_pool.fix
@@ -0,0 +1 @@
+Fix logic error in Gun connection pooling which prevented retries even when the worker was launched with retry = true
diff --git a/changelog.d/gun_pool2.fix b/changelog.d/gun_pool2.fix
new file mode 100644
index 000000000..a1f98b49c
--- /dev/null
+++ b/changelog.d/gun_pool2.fix
@@ -0,0 +1 @@
+Connection pool errors when publishing an activity is a soft-error that will be retried shortly.
diff --git a/changelog.d/gun_pool3.skip b/changelog.d/gun_pool3.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/gun_pool3.skip
diff --git a/changelog.d/handle-report-from-deactivated-user.fix b/changelog.d/handle-report-from-deactivated-user.fix
deleted file mode 100644
index 6692d1aa8..000000000
--- a/changelog.d/handle-report-from-deactivated-user.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix handling report from a deactivated user
diff --git a/changelog.d/handle_object_fetch_failures.change b/changelog.d/handle_object_fetch_failures.change
new file mode 100644
index 000000000..ae44e6f4b
--- /dev/null
+++ b/changelog.d/handle_object_fetch_failures.change
@@ -0,0 +1 @@
+Remote object fetch failures will prevent the object fetch job from retrying if the object request returns 401, 403, 404, 410, or exceeds the maximum thread depth.
diff --git a/changelog.d/healthcheck-disabled-error.fix b/changelog.d/healthcheck-disabled-error.fix
new file mode 100644
index 000000000..984384a52
--- /dev/null
+++ b/changelog.d/healthcheck-disabled-error.fix
@@ -0,0 +1 @@
+TwitterAPI: Return proper error when healthcheck is disabled
diff --git a/changelog.d/instance-contact-account.add b/changelog.d/instance-contact-account.add
new file mode 100644
index 000000000..e119446d2
--- /dev/null
+++ b/changelog.d/instance-contact-account.add
@@ -0,0 +1 @@
+Add contact account to InstanceView
\ No newline at end of file
diff --git a/changelog.d/instance-defdelegates.skip b/changelog.d/instance-defdelegates.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/instance-defdelegates.skip
diff --git a/changelog.d/instance-rules.add b/changelog.d/instance-rules.add
new file mode 100644
index 000000000..42f3cbfa1
--- /dev/null
+++ b/changelog.d/instance-rules.add
@@ -0,0 +1 @@
+Add instance rules
\ No newline at end of file
diff --git a/changelog.d/instance-v2.add b/changelog.d/instance-v2.add
new file mode 100644
index 000000000..4dd7ce8c0
--- /dev/null
+++ b/changelog.d/instance-v2.add
@@ -0,0 +1 @@
+Implement /api/v2/instance route
\ No newline at end of file
diff --git a/changelog.d/instance-v2.skip b/changelog.d/instance-v2.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/instance-v2.skip
diff --git a/changelog.d/issue-3241.fix b/changelog.d/issue-3241.fix
new file mode 100644
index 000000000..d46db9805
--- /dev/null
+++ b/changelog.d/issue-3241.fix
@@ -0,0 +1 @@
+Handle cases when users.inbox is nil.
diff --git a/changelog.d/last_status_at.change b/changelog.d/last_status_at.change
new file mode 100644
index 000000000..5417aff30
--- /dev/null
+++ b/changelog.d/last_status_at.change
@@ -0,0 +1 @@
+- Change AccountView `last_status_at` from a datetime to a date (as done in Mastodon 3.1.0)
\ No newline at end of file
diff --git a/changelog.d/link-verification.add b/changelog.d/link-verification.add
new file mode 100644
index 000000000..d8b11ebbc
--- /dev/null
+++ b/changelog.d/link-verification.add
@@ -0,0 +1 @@
+Verify profile link ownership with rel="me"
\ No newline at end of file
diff --git a/changelog.d/loading-order-test-fix.skip b/changelog.d/loading-order-test-fix.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/loading-order-test-fix.skip
diff --git a/changelog.d/local-webfinger.fix b/changelog.d/local-webfinger.fix
new file mode 100644
index 000000000..d99056efd
--- /dev/null
+++ b/changelog.d/local-webfinger.fix
@@ -0,0 +1 @@
+Use correct domain for fqn and InstanceView
\ No newline at end of file
diff --git a/changelog.d/mark-read.fix b/changelog.d/mark-read.fix
new file mode 100644
index 000000000..346eb19e2
--- /dev/null
+++ b/changelog.d/mark-read.fix
@@ -0,0 +1 @@
+The query for marking notifications as read has been simplified
diff --git a/changelog.d/mastodon_api_v2.add b/changelog.d/mastodon_api_v2.add
new file mode 100644
index 000000000..d53aa35c4
--- /dev/null
+++ b/changelog.d/mastodon_api_v2.add
@@ -0,0 +1 @@
+Add new parameters to /api/v2/instance: configuration[accounts][max_pinned_statuses] and configuration[statuses][characters_reserved_per_url]
diff --git a/changelog.d/mastodon_directory.fix b/changelog.d/mastodon_directory.fix
new file mode 100644
index 000000000..937c8f864
--- /dev/null
+++ b/changelog.d/mastodon_directory.fix
@@ -0,0 +1 @@
+Mastodon API /api/v1/directory: Fix listing directory contents when not authenticated
diff --git a/changelog.d/meilisearch.add b/changelog.d/meilisearch.add
new file mode 100644
index 000000000..4856eea2e
--- /dev/null
+++ b/changelog.d/meilisearch.add
@@ -0,0 +1 @@
+Add meilisearch, make search engines pluggable
diff --git a/changelog.d/memleak.fix b/changelog.d/memleak.fix
new file mode 100644
index 000000000..2465921c0
--- /dev/null
+++ b/changelog.d/memleak.fix
@@ -0,0 +1 @@
+Fix a memory leak caused by Websocket connections that would not enter a state where a full garbage collection run could be triggered.
diff --git a/changelog.d/mergeback-2.6.2.skip b/changelog.d/mergeback-2.6.2.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/mergeback-2.6.2.skip
diff --git a/changelog.d/migration-fix.skip b/changelog.d/migration-fix.skip
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/changelog.d/migration-fix.skip
@@ -0,0 +1 @@
+
diff --git a/changelog.d/missing-mrfs.add b/changelog.d/missing-mrfs.add
new file mode 100644
index 000000000..6a17f9e1a
--- /dev/null
+++ b/changelog.d/missing-mrfs.add
@@ -0,0 +1 @@
+Startup detection for configured MRF modules that are missing or incorrectly defined
diff --git a/changelog.d/mrf-regex-error.fix b/changelog.d/mrf-regex-error.fix
new file mode 100644
index 000000000..2c43bc04a
--- /dev/null
+++ b/changelog.d/mrf-regex-error.fix
@@ -0,0 +1 @@
+MRF: Log sensible error for subdomains_regex
diff --git a/changelog.d/mrf-steal-emoji-extname.fix b/changelog.d/mrf-steal-emoji-extname.fix
new file mode 100644
index 000000000..197aa9b9e
--- /dev/null
+++ b/changelog.d/mrf-steal-emoji-extname.fix
@@ -0,0 +1 @@
+MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
diff --git a/changelog.d/mrf_hashtags.fix b/changelog.d/mrf_hashtags.fix
new file mode 100644
index 000000000..c44c2376b
--- /dev/null
+++ b/changelog.d/mrf_hashtags.fix
@@ -0,0 +1 @@
+Federated timeline removal of hashtags via MRF HashtagPolicy
diff --git a/changelog.d/nil-content-map.fix b/changelog.d/nil-content-map.fix
new file mode 100644
index 000000000..d4943bf74
--- /dev/null
+++ b/changelog.d/nil-content-map.fix
@@ -0,0 +1 @@
+Support objects with a null contentMap (firefish)
diff --git a/changelog.d/no-async-with-clear-config.skip b/changelog.d/no-async-with-clear-config.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/no-async-with-clear-config.skip
diff --git a/changelog.d/no_new_privs.add b/changelog.d/no_new_privs.add
deleted file mode 100644
index b67396a4b..000000000
--- a/changelog.d/no_new_privs.add
+++ /dev/null
@@ -1 +0,0 @@
-(hardening) Add no_new_privs=yes to OpenRC service files
diff --git a/changelog.d/notifications-index.fix b/changelog.d/notifications-index.fix
new file mode 100644
index 000000000..4617cbec0
--- /dev/null
+++ b/changelog.d/notifications-index.fix
@@ -0,0 +1 @@
+Fix notifications query which was not using the index properly
diff --git a/changelog.d/notifications.fix b/changelog.d/notifications.fix
new file mode 100644
index 000000000..a2d2eaea9
--- /dev/null
+++ b/changelog.d/notifications.fix
@@ -0,0 +1 @@
+Notifications: improve performance by filtering on users table instead of activities table
\ No newline at end of file
diff --git a/changelog.d/oauth-nickname.skip b/changelog.d/oauth-nickname.skip
new file mode 100644
index 000000000..02f16e06c
--- /dev/null
+++ b/changelog.d/oauth-nickname.skip
@@ -0,0 +1 @@
+Use User.full_nickname/1 in oauth html template
\ No newline at end of file
diff --git a/changelog.d/opengraph-rich-media-proxy.add b/changelog.d/opengraph-rich-media-proxy.add
new file mode 100644
index 000000000..2b2fc657d
--- /dev/null
+++ b/changelog.d/opengraph-rich-media-proxy.add
@@ -0,0 +1 @@
+Add media proxy to opengraph rich media cards
diff --git a/changelog.d/optimistic-inbox.change b/changelog.d/optimistic-inbox.change
new file mode 100644
index 000000000..2cf1ce92c
--- /dev/null
+++ b/changelog.d/optimistic-inbox.change
@@ -0,0 +1 @@
+Optimistic Inbox reduces the processing overhead of incoming activities without instantly verifiable signatures.
diff --git a/changelog.d/otp26.add b/changelog.d/otp26.add
new file mode 100644
index 000000000..b019afdf3
--- /dev/null
+++ b/changelog.d/otp26.add
@@ -0,0 +1 @@
+Support for Erlang OTP 26
diff --git a/changelog.d/postgres-jit.change b/changelog.d/postgres-jit.change
new file mode 100644
index 000000000..38225b06b
--- /dev/null
+++ b/changelog.d/postgres-jit.change
@@ -0,0 +1 @@
+Disable jit by default for PostgreSQL
diff --git a/changelog.d/prevent-bypassing-authorized-fetch-mode.fix b/changelog.d/prevent-bypassing-authorized-fetch-mode.fix
deleted file mode 100644
index 12f7260d7..000000000
--- a/changelog.d/prevent-bypassing-authorized-fetch-mode.fix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent using the .json format to bypass authorized fetch mode
\ No newline at end of file
diff --git a/changelog.d/prioritize-direct-recipients.add b/changelog.d/prioritize-direct-recipients.add
new file mode 100644
index 000000000..4efc94c68
--- /dev/null
+++ b/changelog.d/prioritize-direct-recipients.add
@@ -0,0 +1 @@
+- Prioritize mentioned recipients (i.e., those that are not just followers) when federating.
diff --git a/changelog.d/promex.change b/changelog.d/promex.change
new file mode 100644
index 000000000..6c1571c54
--- /dev/null
+++ b/changelog.d/promex.change
@@ -0,0 +1 @@
+Change the prometheus library to PromEx.
diff --git a/changelog.d/public-polls.add b/changelog.d/public-polls.add
new file mode 100644
index 000000000..0dae0c38e
--- /dev/null
+++ b/changelog.d/public-polls.add
@@ -0,0 +1 @@
+Expose nonAnonymous field from Smithereen polls
\ No newline at end of file
diff --git a/changelog.d/publisher_discard.change b/changelog.d/publisher_discard.change
new file mode 100644
index 000000000..85e530d8d
--- /dev/null
+++ b/changelog.d/publisher_discard.change
@@ -0,0 +1 @@
+Activity publishing failures will prevent the job from retrying if the publishing request returns a 403 or 410
diff --git a/changelog.d/publisher_log.change b/changelog.d/publisher_log.change
new file mode 100644
index 000000000..3f85f5a1e
--- /dev/null
+++ b/changelog.d/publisher_log.change
@@ -0,0 +1 @@
+Publisher errors will now emit logs indicating the inbox that was not available for delivery.
diff --git a/changelog.d/qtfaststart.fix b/changelog.d/qtfaststart.fix
new file mode 100644
index 000000000..66d2569f2
--- /dev/null
+++ b/changelog.d/qtfaststart.fix
@@ -0,0 +1 @@
+MediaProxy Preview failures prevented when encountering certain video files
diff --git a/changelog.d/quotes-count.skip b/changelog.d/quotes-count.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/quotes-count.skip
diff --git a/changelog.d/reachability.change b/changelog.d/reachability.change
new file mode 100644
index 000000000..06f63272b
--- /dev/null
+++ b/changelog.d/reachability.change
@@ -0,0 +1 @@
+Reduce the reachability timestamp update to a single upsert query
diff --git a/changelog.d/realpath-over-readlink.fix b/changelog.d/realpath-over-readlink.fix
new file mode 100644
index 000000000..479561b95
--- /dev/null
+++ b/changelog.d/realpath-over-readlink.fix
@@ -0,0 +1 @@
+pleroma_ctl: Use realpath(1) instead of readlink(1)
diff --git a/changelog.d/receiverworker-error-handling.fix b/changelog.d/receiverworker-error-handling.fix
new file mode 100644
index 000000000..f017a2bba
--- /dev/null
+++ b/changelog.d/receiverworker-error-handling.fix
@@ -0,0 +1 @@
+ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
\ No newline at end of file
diff --git a/changelog.d/remote-fetcher-error.skip b/changelog.d/remote-fetcher-error.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/remote-fetcher-error.skip
diff --git a/changelog.d/reply-to-deleted.change b/changelog.d/reply-to-deleted.change
new file mode 100644
index 000000000..8b952ee7a
--- /dev/null
+++ b/changelog.d/reply-to-deleted.change
@@ -0,0 +1 @@
+A 422 error is returned when attempting to reply to a deleted status
diff --git a/changelog.d/rich_media.fix b/changelog.d/rich_media.fix
new file mode 100644
index 000000000..08f119550
--- /dev/null
+++ b/changelog.d/rich_media.fix
@@ -0,0 +1 @@
+Rich Media Preview cache eviction when the activity is updated.
diff --git a/changelog.d/rich_media_refactor.change b/changelog.d/rich_media_refactor.change
new file mode 100644
index 000000000..c0d4e3b0a
--- /dev/null
+++ b/changelog.d/rich_media_refactor.change
@@ -0,0 +1 @@
+Refactored Rich Media to cache the content in the database. Fetching operations that could block status rendering have been eliminated.
diff --git a/changelog.d/rich_media_tests.skip b/changelog.d/rich_media_tests.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/rich_media_tests.skip
diff --git a/changelog.d/richmediattl.fix b/changelog.d/richmediattl.fix
new file mode 100644
index 000000000..98de63015
--- /dev/null
+++ b/changelog.d/richmediattl.fix
@@ -0,0 +1 @@
+Parsing of RichMedia TTLs for Amazon URLs when query parameters are nil
diff --git a/changelog.d/scrobble-url.add b/changelog.d/scrobble-url.add
new file mode 100644
index 000000000..24bdeed89
--- /dev/null
+++ b/changelog.d/scrobble-url.add
@@ -0,0 +1 @@
+Adds the capability to add a URL to a scrobble (optional field)
diff --git a/changelog.d/scrubbers-html4-GtS.add b/changelog.d/scrubbers-html4-GtS.add
new file mode 100644
index 000000000..7f99dbb25
--- /dev/null
+++ b/changelog.d/scrubbers-html4-GtS.add
@@ -0,0 +1 @@
+- scrubbers/default: Add more formatting elements from HTML4 / GoToSocial (acronym, bdo, big, cite, dfn, ins, kbd, q, samp, s, tt, var, wbr)
diff --git a/changelog.d/search-healthcheck.add b/changelog.d/search-healthcheck.add
new file mode 100644
index 000000000..4974925e7
--- /dev/null
+++ b/changelog.d/search-healthcheck.add
@@ -0,0 +1 @@
+Monitoring of search backend health to control the processing of jobs in the search indexing Oban queue
diff --git a/changelog.d/status-notification-type.add b/changelog.d/status-notification-type.add
new file mode 100644
index 000000000..a6e94fa87
--- /dev/null
+++ b/changelog.d/status-notification-type.add
@@ -0,0 +1 @@
+Add "status" notification type
\ No newline at end of file
diff --git a/changelog.d/system-cflags.fix b/changelog.d/system-cflags.fix
new file mode 100644
index 000000000..84de5ad57
--- /dev/null
+++ b/changelog.d/system-cflags.fix
@@ -0,0 +1 @@
+- Fix eblurhash and elixir-captcha not using system cflags
diff --git a/changelog.d/tesla.deps b/changelog.d/tesla.deps
new file mode 100644
index 000000000..799bbc670
--- /dev/null
+++ b/changelog.d/tesla.deps
@@ -0,0 +1 @@
+Update Tesla HTTP client middleware to 1.8.0
diff --git a/changelog.d/test-improvements.skip b/changelog.d/test-improvements.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/test-improvements.skip
diff --git a/changelog.d/testsecrets.skip b/changelog.d/testsecrets.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/testsecrets.skip
diff --git a/changelog.d/transient-validators-defaults.change b/changelog.d/transient-validators-defaults.change
new file mode 100644
index 000000000..225cf4d0c
--- /dev/null
+++ b/changelog.d/transient-validators-defaults.change
@@ -0,0 +1 @@
+Set default values on validators for transient objects (attachment, poll options)
diff --git a/changelog.d/typo.skip b/changelog.d/typo.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/typo.skip
diff --git a/changelog.d/update-credentials-limit-error.fix b/changelog.d/update-credentials-limit-error.fix
deleted file mode 100644
index 7682f958e..000000000
--- a/changelog.d/update-credentials-limit-error.fix
+++ /dev/null
@@ -1 +0,0 @@
-Show more informative errors when profile exceeds char limits
diff --git a/changelog.d/vips.change b/changelog.d/vips.change
new file mode 100644
index 000000000..ee18cd34b
--- /dev/null
+++ b/changelog.d/vips.change
@@ -0,0 +1 @@
+Change mediaproxy previews to use vips to generate thumbnails instead of ImageMagick
diff --git a/changelog.d/web_push.fix b/changelog.d/web_push.fix
new file mode 100644
index 000000000..cf933e2d4
--- /dev/null
+++ b/changelog.d/web_push.fix
@@ -0,0 +1 @@
+Fix web push notifications not successfully delivering
diff --git a/changelog.d/web_push_filtered.fix b/changelog.d/web_push_filtered.fix
new file mode 100644
index 000000000..b9159362a
--- /dev/null
+++ b/changelog.d/web_push_filtered.fix
@@ -0,0 +1 @@
+Web Push notifications are no longer generated for muted/blocked threads and users.
diff --git a/changelog.d/webfinger-validation.fix b/changelog.d/webfinger-validation.fix
new file mode 100644
index 000000000..e64312666
--- /dev/null
+++ b/changelog.d/webfinger-validation.fix
@@ -0,0 +1 @@
+Fix validate_webfinger when running a different domain for Webfinger
\ No newline at end of file
diff --git a/changelog.d/websocket-refactor.change b/changelog.d/websocket-refactor.change
new file mode 100644
index 000000000..3c447832b
--- /dev/null
+++ b/changelog.d/websocket-refactor.change
@@ -0,0 +1 @@
+Refactor the Mastodon /api/v1/streaming websocket handler to use Phoenix.Socket.Transport