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

Commit 0437602

Browse files
committed
Merge remote-tracking branch 'origin/develop' into clokep/restricted-auth
2 parents c82c0ce + b181dc4 commit 0437602

Some content is hidden

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

99 files changed

+1123
-280
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,15 @@ jobs:
344344
env:
345345
COMPLEMENT_BASE_IMAGE: complement-synapse:latest
346346
working-directory: complement
347+
348+
# a job which marks all the other jobs as complete, thus allowing PRs to be merged.
349+
tests-done:
350+
needs:
351+
- trial
352+
- trial-olddeps
353+
- sytest
354+
- portdb
355+
- complement
356+
runs-on: ubuntu-latest
357+
steps:
358+
- run: "true"

CHANGES.md

Lines changed: 69 additions & 0 deletions

changelog.d/10250.bugfix

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

changelog.d/10276.bugfix

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

changelog.d/10283.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Initial support for MSC3244, Room version capabilities over the /capabilities API.

changelog.d/10289.misc

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

changelog.d/10298.feature

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

changelog.d/10305.feature

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

changelog.d/10313.doc

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

changelog.d/10315.misc

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

0 commit comments

Comments
 (0)