Merge branch 'release-v1.10.0' into develop

This commit is contained in:
Richard van der Hoff 2020-02-11 10:43:47 +00:00
commit 605cd089f7
3 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,12 @@
Synapse 1.10.0rc4 (2020-02-11)
==============================
Features
--------
- Filter out m.room.aliases from /sync state blocks until a full fix lands. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
Synapse 1.10.0rc3 (2020-02-10) Synapse 1.10.0rc3 (2020-02-10)
============================== ==============================

View file

@ -36,7 +36,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.10.0rc3" __version__ = "1.10.0rc4"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when # We import here so that we don't have to install a bunch of deps when

View file

@ -932,6 +932,7 @@ class SyncHandler(object):
for e in sync_config.filter_collection.filter_room_state( for e in sync_config.filter_collection.filter_room_state(
list(state.values()) list(state.values())
) )
if e.type != EventTypes.Aliases # until MSC2261 or alternative solution
} }
async def unread_notifs_for_room_id( async def unread_notifs_for_room_id(