mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-21 17:15:38 +03:00
Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. (#11700)
This commit is contained in:
parent
ea27528b5d
commit
72e7f1c420
3 changed files with 9 additions and 7 deletions
1
changelog.d/11700.removal
Normal file
1
changelog.d/11700.removal
Normal file
|
@ -0,0 +1 @@
|
|||
Remove workaround introduced in Synapse 1.50.0 for Mjolnir compatibility. Breaks compatibility with Mjolnir 1.3.1 and earlier.
|
|
@ -106,6 +106,14 @@ You will need to ensure `synctl` is on your `PATH`.
|
|||
automatically, though you might need to activate a virtual environment
|
||||
depending on how you installed Synapse.
|
||||
|
||||
|
||||
## Compatibility dropped for Mjolnir 1.3.1 and earlier
|
||||
|
||||
Synapse v1.55.0 drops support for Mjolnir 1.3.1 and earlier.
|
||||
If you use the Mjolnir module to moderate your homeserver,
|
||||
please upgrade Mjolnir to version 1.3.2 or later before upgrading Synapse.
|
||||
|
||||
|
||||
# Upgrading to v1.54.0
|
||||
|
||||
## Legacy structured logging configuration removal
|
||||
|
|
|
@ -31,13 +31,6 @@ from synapse.logging import context
|
|||
if typing.TYPE_CHECKING:
|
||||
pass
|
||||
|
||||
# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to
|
||||
# matrix_common.
|
||||
# As a temporary workaround, we import glob_to_regex here for
|
||||
# compatibility with current versions of Mjolnir.
|
||||
# See https://github.com/matrix-org/mjolnir/pull/174
|
||||
from matrix_common.regex import glob_to_regex # noqa
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue