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

Commit fc706cc

Browse files
committed
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/remote_public_rooms_list_errors
* 'develop' of github.com:matrix-org/synapse: (214 commits) Clean up some LoggingContext stuff (#7120) Fix CAS redirect url (#6634) Newsfile Fix starting workers when federation sending not split out. Use the proper error code when a canonical alias that does not exist is used. (#7109) Update pre-built package name for FreeBSD (#7107). (#7107) Convert `*StreamRow` classes to inner classes (#7116) matrix.org was fine Update CHANGES.md changelog typos 1.12.0 changelog 1.12.0 Fix processing of `groups` stream, and use symbolic names for streams (#7117) Set Referrer-Policy to no-referrer for media (#7009) Clean-up some auth/login REST code (#7115) Improve database configuration docs (#6988) Remove concept of a non-limited stream. (#7011) Convert some of the media REST code to async/await (#7110) Fix a bug in the federation API which could cause occasional "Failed to get PDU" errors (#7089). more changelog ...
2 parents 092aef9 + b1cfaf0 commit fc706cc

File tree

269 files changed

+7055
-5080
lines changed

Some content is hidden

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

269 files changed

+7055
-5080
lines changed

.buildkite/scripts/test_old_deps.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
set -ex
77

88
apt-get update
9-
apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev
10-
11-
# workaround for https://github.com/jaraco/zipp/issues/40
12-
python3.5 -m pip install 'setuptools>=34.4.0'
13-
14-
python3.5 -m pip install tox
9+
apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev tox
1510

1611
export LANG="C.UTF-8"
1712

CHANGES.md

Lines changed: 253 additions & 3 deletions

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

INSTALL.md

Lines changed: 27 additions & 13 deletions

changelog.d/6634.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix single-sign on with CAS systems: pass the same service URL when requesting the CAS ticket and when calling the `proxyValidate` URL. Contributed by @Naugrimm.

changelog.d/6769.feature

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

changelog.d/6781.bugfix

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

changelog.d/6821.misc

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

changelog.d/6823.misc

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

changelog.d/6825.bugfix

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

0 commit comments

Comments
 (0)