Merge branch 'errorview-json-fix' into 'develop'

Fix errors in ErrorView See merge request !3489

Merge branch 'errorview-json-fix' into 'develop'
Fix errors in ErrorView See merge request !3489
7495beeb · feld · 7acdab1f · 3d8ce61f · 7495beeb · 7495beeb
Commit 7495beeb authored Jul 27, 2021 by feld
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG.md CHANGELOG.md +1 -0

config/config.exs config/config.exs +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Remote users can no longer reappear after being deleted.
 - Deactivated users may now be deleted.
 - Mix task `pleroma.database prune_objects`
+- Fixed rendering of JSON errors on ActivityPub endpoints.
 - Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters

 ### Removed

--- a/config/config.exs
+++ b/config/config.exs
@@ -460,7 +460,7 @@
  enabled: true,
  limit: 5_000

-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason, "activity+json": Jason

 config :phoenix, :json_library, Jason