Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix inserting bytes as text in censor_redactions#6185

Merged
erikjohnston merged 4 commits intodevelopfrom
erikj/fix_censored_evnets
Oct 9, 2019
Merged

Fix inserting bytes as text in censor_redactions#6185
erikjohnston merged 4 commits intodevelopfrom
erikj/fix_censored_evnets

Conversation

@erikjohnston
Copy link
Member

@erikjohnston erikjohnston commented Oct 8, 2019

FTR this is based off of master in case we want to ship a hot fix.

@erikjohnston erikjohnston requested a review from a team October 8, 2019 14:09
@erikjohnston erikjohnston force-pushed the erikj/fix_censored_evnets branch from feec380 to e7631d8 Compare October 8, 2019 15:18
@erikjohnston erikjohnston changed the base branch from master to develop October 8, 2019 15:23
@erikjohnston
Copy link
Member Author

Test failures are due to develop not being merged in.

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm other than incomprehensible changelog

Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@erikjohnston erikjohnston merged commit def5413 into develop Oct 9, 2019
richvdh pushed a commit that referenced this pull request Oct 17, 2019
Fix inserting bytes as text in `censor_redactions`
richvdh added a commit that referenced this pull request Oct 17, 2019
Synapse 1.4.1rc1 (2019-10-17)
=============================

Bugfixes
--------

- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](#6185), [5b0e994](5b0e994))
babolivier added a commit that referenced this pull request Oct 18, 2019
Synapse 1.4.1 (2019-10-18)
==========================

No changes since 1.4.1rc1.

Synapse 1.4.1rc1 (2019-10-17)
=============================

Bugfixes
--------

- Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](#6185), [5b0e994](5b0e994))
@erikjohnston erikjohnston deleted the erikj/fix_censored_evnets branch January 9, 2020 15:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants