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

Commit b04af11

Browse files
hughnshughns
committed
Merge branch 'quenting/hotfix-delegated-auth-admin' of https://github.com/matrix-org/synapse into quenting/hotfix-delegated-auth-admin
2 parents 10b4e12 + b54983d commit b04af11

File tree

184 files changed

+2097
-1688
lines changed

Some content is hidden

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

184 files changed

+2097
-1688
lines changed

‎.ci/scripts/calculate_jobs.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ def set_output(key: str, value: str):
4747
"database": "sqlite",
4848
"extras": "all",
4949
}
50-
for version in ("3.9", "3.10", "3.11")
50+
for version in ("3.9", "3.10", "3.11", "3.12.0-rc.1")
5151
)
5252

53-
5453
trial_postgres_tests = [
5554
{
5655
"python-version": "3.8",

‎.github/workflows/latest_deps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
# `pip install matrix-synapse[all]` as closely as possible.
5858
- run: poetry update --no-dev
5959
- run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true)
60-
- name: Remove warn_unused_ignores from mypy config
61-
run: sed '/warn_unused_ignores = True/d' -i mypy.ini
60+
- name: Remove unhelpful options from mypy config
61+
run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini
6262
- run: poetry run mypy
6363
trial:
6464
needs: check_repo

‎.github/workflows/twisted_trunk.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
poetry remove twisted
5555
poetry add --extras tls git+https://github.com/twisted/twisted.git#${{ inputs.twisted_ref || 'trunk' }}
5656
poetry install --no-interaction --extras "all test"
57-
- name: Remove warn_unused_ignores from mypy config
58-
run: sed '/warn_unused_ignores = True/d' -i mypy.ini
57+
- name: Remove unhelpful options from mypy config
58+
run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini
5959
- run: poetry run mypy
6060

6161
trial:

‎Cargo.lock‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎changelog.d/15816.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add configuration setting for CAS protocol version. Contributed by Aurélien Grimpard.

‎changelog.d/16008.doc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update links to the matrix.org blog.

‎changelog.d/16099.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Prepare unit tests for Python 3.12.

‎changelog.d/16113.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Suppress notifications from message edits per [MSC3958](https://github.com/matrix-org/matrix-spec-proposals/pull/3958).

‎changelog.d/16121.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Attempt to fix the twisted trunk job.

‎changelog.d/16135.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Describe which rate limiter was hit in logs.

0 commit comments

Comments
 (0)