This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note to reviewer:
1st commit is a cherry-pick of matrix-org/synapse#11743
2nd commit is a cherry-pick of matrix-org/synapse#11790
3rd commit removes the now obsolete
register_mxid_from_3pid
setting introduced in matrix-org/synapse#30964th commit removes some hacks specific to synapse-dinsic that were made to better ignore username at registration that aren't needed anymore.
Note to ops:
This change removes the
register_mxid_from_3pid
setting. To reproduce its behaviour, the newinhibit_user_in_use_error
setting must be set totrue
and https://github.com/matrix-org/synapse-username-from-threepid must be installed and configured withthreepid_to_use
set to the same value asregister_mxid_from_3pid
was, andfail_if_not_found
set totrue
.