diff options
| author | feld <feld@feld.me> | 2021-07-27 16:24:53 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-07-27 16:24:53 +0000 |
| commit | 7495beeb4086d925cdb006368eb318c630eb0276 (patch) | |
| tree | f8f94dbfdb5053835afa5c3e0711d3d7f2e8bbda | |
| parent | 7acdab1f305bac744a302e3b44e2e920d6bc8a47 (diff) | |
| parent | 3d8ce61fe50747c0025082a0c8fddf0fa73bcf96 (diff) | |
| download | pleroma-7495beeb4086d925cdb006368eb318c630eb0276.tar.gz pleroma-7495beeb4086d925cdb006368eb318c630eb0276.zip | |
Merge branch 'errorview-json-fix' into 'develop'
Fix errors in ErrorView
See merge request pleroma/pleroma!3489
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 155248a81..0dc536c55 100644 --- 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 diff --git a/config/config.exs b/config/config.exs index 2f8a18788..b50c910b1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -460,7 +460,7 @@ config :pleroma, :shout, 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 |