summary refs log tree commit diff
path: root/synapse/api/urls.py (unfollow)
Commit message (Collapse)AuthorFilesLines
2020-04-03Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2-8/+9
By running this stuff with `run_in_background`, it won't be correctly reported against the relevant CPU usage stats. Fixes #7202
2020-04-03Revert "Revert "Merge pull request #7153 from ↵Richard van der Hoff4-1/+28
matrix-org/babolivier/sso_whitelist_login_fallback"" This reverts commit 0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1.
2020-04-03Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff3-22/+32
This reverts commit 8d4cbdeaa9765ae0d87ec82b053f12ed8162f6f5.
2020-04-03Revert "Merge pull request #7153 from ↵Richard van der Hoff4-28/+1
matrix-org/babolivier/sso_whitelist_login_fallback" This was incorrectly merged to master. This reverts commit 319c41f573eb14a966367b60b2e6e93bf6b028d9, reversing changes made to 229eb81498b0fe1da81e9b5b333a0285acde9446.
2020-04-03Revert "Improve the UX of the login fallback when using SSO (#7152)"Richard van der Hoff3-32/+22
This was incorrectly merged to `master` instead of develop. This reverts commit 90246344e340bce3417fb330da6be9338a701c5c.
2020-04-03tweak changelog v1.12.3 github/release-v1.12.3 release-v1.12.3Richard van der Hoff1-5/+2
2020-04-031.12.3Richard van der Hoff4-4/+16
2020-04-03Update docstring per review commentsRichard van der Hoff1-1/+1
2020-04-03Fix device list update stream ids going backward (#7158)Richard van der Hoff3-2/+15
Occasionally we could get a federation device list update transaction which looked like: ``` [ {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D2', 'prev_id': [], 'stream_id': 12, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D1', 'prev_id': [12], 'stream_id': 11, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D3', 'prev_id': [11], 'stream_id': 13, 'deleted': True}} ] ``` Having `stream_ids` which are lower than `prev_ids` looks odd. It might work (I'm not actually sure), but in any case it doesn't seem like a reasonable thing to expect other implementations to support.
2020-04-03Fix the debian build in a better way. (#7212)Richard van der Hoff4-9/+36
2020-04-02Fix changelog wording v1.12.2 github/release-v1.12.2 release-v1.12.2Andrew Morgan1-1/+1
2020-04-021.12.2Andrew Morgan3-1/+17
2020-04-02Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan1-1/+3
2020-04-021.12.1Andrew Morgan3-1/+13
2020-04-02review commentRichard van der Hof