Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-04-25 14:39:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release-v1.35.0'

Browse Source
This commit is contained in:
Tulir Asokan 2021-05-27 17:01:46 +03:00
commit 6a883908cf
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.md
View File

@ -1,3 +1,12 @@
Synapse 1.35.0rc2 (2021-05-27)
==============================
Bugfixes
--------
- Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request. ([\#10079](https://github.com/matrix-org/synapse/issues/10079))
Synapse 1.35.0rc1 (2021-05-25) Synapse 1.35.0rc1 (2021-05-25)
============================== ==============================

2
synapse/__init__.py
View File

@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.35.0rc1" __version__ = "1.35.0rc2"
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

2
synapse/federation/transport/server.py
View File

@ -1398,7 +1398,7 @@ class FederationSpaceSummaryServlet(BaseFederationServlet):
) )
return 200, await self.handler.federation_space_summary( return 200, await self.handler.federation_space_summary(
room_id, suggested_only, max_rooms_per_space, exclude_rooms origin, room_id, suggested_only, max_rooms_per_space, exclude_rooms
) )
# TODO When switching to the stable endpoint, remove the POST handler. # TODO When switching to the stable endpoint, remove the POST handler.