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

Commit 903ee78

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 58729e5 + eda8c88 commit 903ee78

File tree

187 files changed

+2159
-1259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+2159
-1259
lines changed

CHANGES.md

Lines changed: 98 additions & 0 deletions

README.rst

Lines changed: 1 addition & 1 deletion

changelog.d/10659.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10690.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10776.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10777.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10782.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10785.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10796.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10807.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10810.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10814.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10815.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10816.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10817.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10819.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10820.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10823.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10826.misc

Lines changed: 0 additions & 2 deletions
This file was deleted.

changelog.d/10827.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10829.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10831.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10833.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10834.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10835.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10838.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10839.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10843.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10845.doc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10856.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10859.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10865.doc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10867.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10868.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10869.doc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10873.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10875.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10877.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ensure `(room_id, next_batch_id)` is unique across [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) insertion events in rooms to avoid cross-talk/conflicts between batches.

changelog.d/10879.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10880.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10881.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10887.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10889.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10891.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10893.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10895.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix type hints to be compatible with an upcoming change to Twisted.

changelog.d/10896.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10897.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10898.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10901.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10902.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update utility code to handle C implementations of frozendict.

changelog.d/10903.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drop old functionality which maintained database compatibility with Synapse versions before 1.31.

changelog.d/10906.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10907.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10911.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10913.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10915.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clean-up configuration helper classes for the `ServerConfig` class.
File renamed without changes.

changelog.d/10917.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10922.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a minor bug in the response to `/_matrix/client/r0/voip/turnServer`. Contributed by @lukaslihotzki.

changelog.d/10924.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug where empty `yyyy-mm-dd/` directories would be left behind in the media store's `url_cache_thumbnails/` directory.

changelog.d/10925.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

changelog.d/10927.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug introduced in Synapse v1.40.0 where the signature checks for room version 8/9 could be applied to earlier room versions in some situations.

changelog.d/10934.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor various parts of the codebase to use `RoomVersion` objects instead of room version identifier strings.

changelog.d/10935.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor user directory tests in preparation for upcoming changes.

changelog.d/10936.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Include the event id in the logcontext when handling PDUs received over federation.

changelog.d/10939.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix logged errors in unit tests.
File renamed without changes.

changelog.d/10945.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a broken test to ensure that consent configuration works during registration.

changelog.d/10947.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes a long-standing bug wherin deactivated users still count towards the mau limit.

changelog.d/10958.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add type hints to filtering classes.
File renamed without changes.

changelog.d/10960.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a long-standing bug where rebuilding the user directory wouldn't exclude support and disabled users.

changelog.d/10961.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add type-hint to `HomeserverTestcase.setup_test_homeserver`.

changelog.d/10963.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix the test utility function `create_room_as` so that `is_public=True` will explicitly set the `visibility` parameter of room creation requests to `public`. Contributed by @AndrewFerr.

changelog.d/9655.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069) support to `/account/whoami`.

debian/changelog

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
matrix-synapse-py3 (1.44.0~rc3) stable; urgency=medium
2+
3+
* New synapse release 1.44.0~rc3.
4+
5+
-- Synapse Packaging team <[email protected]> Mon, 04 Oct 2021 14:57:22 +0100
6+
7+
matrix-synapse-py3 (1.44.0~rc2) stable; urgency=medium
8+
9+
* New synapse release 1.44.0~rc2.
10+
11+
-- Synapse Packaging team <[email protected]> Thu, 30 Sep 2021 12:39:10 +0100
12+
13+
matrix-synapse-py3 (1.44.0~rc1) stable; urgency=medium
14+
15+
* New synapse release 1.44.0~rc1.
16+
17+
-- Synapse Packaging team <[email protected]> Tue, 28 Sep 2021 13:41:28 +0100
18+
119
matrix-synapse-py3 (1.43.0) stable; urgency=medium
220

321
* New synapse release 1.43.0.

docker/Dockerfile-dhvirtualenv

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \
4747
&& cd /dh-virtualenv \
4848
&& env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -y --no-install-recommends"
4949

50-
# build it
51-
RUN cd /dh-virtualenv && dpkg-buildpackage -us -uc -b
50+
# Build it. Note that building the docs doesn't work due to differences in
51+
# Sphinx APIs across versions/distros.
52+
RUN cd /dh-virtualenv && DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage -us -uc -b
5253

5354
###
5455
### Stage 1

0 commit comments

Comments
 (0)