summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Warn users trying to use the deprecated spam checker interface (#10210)Brendan Abolivier2021-06-222-0/+16
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-2214-23/+584
* Implement config option `sso.update_profile_information` (#10108)jkanefendt2021-06-214-1/+51
* Fix performance of responding to user key requests over federation (#10221)Erik Johnston2021-06-213-1/+11
* Check third party rules before persisting knocks over federation (#10212)Andrew Morgan2021-06-212-2/+3
* Ensure that errors during startup are written to the logs and the console. (#...Richard van der Hoff2021-06-215-16/+55
* Deploy a documentation version for each new Synapse release (#10198)Andrew Morgan2021-06-182-0/+34
* Fix a missing await when in the spaces summary. (#10208)Patrick Cloke2021-06-183-3/+100
* Describe callbacks signatures as async in new modules doc (#10206)Brendan Abolivier2021-06-182-8/+9
* Standardise the module interface (#10062)Brendan Abolivier2021-06-1823-188/+769
* Expose opentracing trace id in response headers (#10199)Richard van der Hoff2021-06-183-0/+25
* Remove support for ACME v1 (#10194)Brendan Abolivier2021-06-1718-836/+18
* Update MSC3083 support per changes in the MSC. (#10189)Patrick Cloke2021-06-174-31/+47
* Ensure that we do not cache empty sync responses after a timeout (#10158)Richard van der Hoff2021-06-178-21/+84
* Rip out the DNS lookup limiter (#10190)Richard van der Hoff2021-06-172-104/+1
* update black to 21.6b0 (#10197)Marcus2021-06-1717-27/+28
* Fix incorrect time magnitude on delayed call (#10195)Andrew Morgan2021-06-172-1/+2
* Add fields to better debug where events are being soft_failed (#10168)Eric Eastwood2021-06-172-3/+19
* Fix persist_events to stop leaking opentracing contexts (#10193)Richard van der Hoff2021-06-172-1/+2
* Improve comments in the structured logging code. (#10188)Patrick Cloke2021-06-162-4/+6
* Always require users to re-authenticate for dangerous operations. (#10184)Patrick Cloke2021-06-166-1/+24
* A guide to the request log lines format. (#8436)Michael Kaye2021-06-163-0/+46
* Add debug logging when we enter/exit Measure block (#10183)Erik Johnston2021-06-162-0/+6
* Fix requestOpenIdToken response: integer expires_in (#10175)Lukas Lihotzki2021-06-162-1/+2
* Fix broken links in documentation (#10180)Dirk Klimpel2021-06-1619-51/+53
* Make opentracing trace into event persistence (#10134)Richard van der Hoff2021-06-164-9/+99
* Merge branch 'master' into developErik Johnston2021-06-153-1/+13
|\
| * 1.36.0 v1.36.0 github/release-v1.36 release-v1.36Erik Johnston2021-06-153-1/+13
* | Remove support for unstable MSC1772 prefixes. (#10161)Patrick Cloke2021-06-153-16/+4
* | Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-1513-96/+33
* | Fix 'ip_range_whitelist' not working for federation servers (#10115)Michael Kutzner2021-06-153-13/+19
* | Refactor `EventPersistenceQueue` (#10145)Richard van der Hoff2021-06-142-77/+89
* | Extend `ResponseCache` to pass a context object into the callback (#10157)Richard van der Hoff2021-06-145-37/+146
* | Notes on boolean columns in database schemas (#10164)Richard van der Hoff2021-06-112-0/+43
* | Merge tag 'v1.36.0rc2' into developErik Johnston2021-06-115-4/+12
|\|
| * Fixup changelog v1.36.0rc2Erik Johnston2021-06-111-1/+1
| * 1.36.0rc2Erik Johnston2021-06-115-4/+12
| * Only send a presence state to a destination once (#10165)Erik Johnston2021-06-112-13/+13
| * Fix sending presence over federation when using workers (#10163)Erik Johnston2021-06-112-6/+20
| * Fix bug when running presence off master (#10149)Erik Johnston2021-06-113-1/+17
* | Only send a presence state to a destination once (#10165)Erik Johnston2021-06-112-13/+13
* | Support for database schema version ranges (#9933)Richard van der Hoff2021-06-117-77/+206
* | Use the matching complement branch when running tests in CI. (#10160)Patrick Cloke2021-06-112-5/+24
* | Fix sending presence over federation when using workers (#10163)Erik Johnston2021-06-112-6/+20
* | Clean up a broken import in admin_cmd.py (#10154)Andrew Morgan2021-06-112-2/+1
* | Fix bug when running presence off master (#10149)Erik Johnston2021-06-113-1/+17
* | Add metrics to track how often events are `soft_failed` (#10156)Eric Eastwood2021-06-112-0/+8
* | Document how to see logger output when running the twisted tests (#10148)Eric Eastwood2021-06-113-13/+26
* | Mention that you need to configure max upload size in reverse proxy as well (...Aaron Raimist2021-06-103-0/+9
* | Update Complement run with Synapse-supported MSC-related build tags (#10155)Andrew Morgan2021-06-092-1/+2
* | Integrate knock rooms with the public rooms directory (#9359)Andrew Morgan2021-06-093-5/+11
* | Implement knock feature (#6739)Sorunome2021-06-0929-118/+1613
* | Limit the number of in-flight /keys/query requests from a single device. (#10...Patrick Cloke2021-06-094-173/+196
* | Clean up the interface for injecting opentracing over HTTP (#10143)Richard van der Hoff2021-06-094-92/+26
* | Add type hints to the federation server transport. (#10080)Patrick Cloke2021-06-085-75/+194
|/
* Make changelog lines consistent v1.36.0rc1Andrew Morgan2021-06-081-1/+1
* fix typo in changelogAndrew Morgan2021-06-081-1/+1
* 1.36.0rc1Andrew Morgan2021-06-0846-45/+69
* Fix logging context when opening new DB connection (#10141)Erik Johnston2021-06-082-3/+10
* Correct type hints for parse_string(s)_from_args. (#10137)Patrick Cloke2021-06-088-83/+132
* Name release branches just after major.minor (#10013)Dan Callahan2021-06-083-5/+6
* When joining a remote room limit the number of events we concurrently check s...Erik Johnston2021-06-085-256/+202
* Handle /backfill returning no events (#10133)Erik Johnston2021-06-082-13/+26
* More database opentracing (#10136)Richard van der Hoff2021-06-072-2/+6
* opentracing: use a consistent name for background processes (#10135)Richard van der Hoff2021-06-073-2/+5
* Make link in docs use HTTPS (#10130)Rohan Sharma2021-06-072-1/+2
* Fix broken link to README at root of repo (#10132)Chris Castle2021-06-072-1/+2
* Always update AS last_pos, even on no events (#10107)14mRh4X0r2021-06-073-17/+15
* Add missing type hints to the admin API servlets (#10105)Dirk Klimpel2021-06-076-40/+48
* Delete completes to-device messages earlier in /sync (#10124)Richard van der Hoff2021-06-072-10/+12
* Don't try and backfill the same room in parallel. (#10116)Erik Johnston2021-06-042-0/+9
* Limit number of events in a replication request (#10118)Erik Johnston2021-06-042-2/+4
* Enable Prometheus metrics for the jaeger client library (#10112)Richard van der Hoff2021-06-043-1/+5
* Compile and render Synapse's docs into a browsable, mobile-friendly and searc...Andrew Morgan2021-06-0335-54/+978
* Add OpenTracing for database activity. (#10113)Richard van der Hoff2021-06-033-33/+60
* Improve opentracing annotations for Notifier (#10111)Richard van der Hoff2021-06-032-33/+34
* Convert admin api docs to markdown (#10089)Andrew Morgan2021-06-039-1132/+1160
* r0.6.1 support: /rooms/:roomId/aliases endpoint (#9224)Travis Ralston2021-06-033-3/+3
* Merge branch 'master' into developPatrick Cloke2021-06-034-2/+16
|\
| * Clarify changelog. v1.35.1 github/release-v1.35 release-v1.35Patrick Cloke2021-06-031-1/+1
| * 1.35.1Patrick Cloke2021-06-034-2/+16
| * Do not show invite-only rooms in spaces summary (unless joined/invited). (#10...Patrick Cloke2021-06-032-10/+10
* | Add new admin APIs to remove media by media ID from quarantine. (#10044)Dirk Klimpel2021-06-025-10/+201
* | github actions: summarize Sytest results in an easy-to-read format (#10094)Richard van der Hoff2021-06-022-2/+3
* | Rewrite the KeyRing (#10035)Erik Johnston2021-06-028-492/+393
* | Do not show invite-only rooms in spaces summary (unless joined/invited). (#10...Patrick Cloke2021-06-022-10/+10
* | Make /sync do less state res (#10102)Erik Johnston2021-06-022-2/+3
* | Merge branch 'master' into developAndrew Morgan2021-06-015-2/+50
|\|
| * Merge v1.35.0rc3 into v1.35.0 due to incorrect tagging v1.35.0Andrew Morgan2021-06-011-5/+1
| * Indicate that there were no functional changes since v1.35.0rc3Andrew Morgan2021-06-011-0/+2
| * 1.35.0Andrew Morgan2021-06-014-2/+16
| * Announce deprecation of experimental `msc2858_enabled` option. (#10101)Erik Johnston2021-06-011-0/+1
| * CHANGELOGErik Johnston2021-05-281-2/+2
| * 1.35.0rc3Erik Johnston2021-05-285-4/+17
| * Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35Erik Johnston2021-05-283-2/+10
| |\
| * | Limit the number of events sent over replication when persisting events. (#10...Brendan Abolivier2021-05-282-7/+11
| * | Log method and path when dropping request due to size limit (#10091)Erik Johnston2021-05-282-1/+4
| * | Allow response of `/send_join` to be larger. (#10093)Erik Johnston2021-05-283-1/+21
* | | add a cache to have_seen_event (#9953)Richard van der Hoff2021-06-0110-20/+205
* | | Fix opentracing inject to use the SpanContext, not the Span (#10074)Brad Murray2021-06-012-5/+6
* | | Set opentracing priority before setting other tags (#10092)Richard van der Hoff2021-05-285-11/+32
* | | Log method and path when dropping request due to size limit (#10091)Erik Johnston2021-05-282-1/+4
* | | Add `parse_strings_from_args` to get `prev_events` array (#10048)Eric Eastwood2021-05-282-43/+154
* | | Move some more endpoints off master (#10084)Erik Johnston2021-05-274-6/+10
* | | Make reason and score optional for report_event (#10077)Callum Brown2021-05-276-13/+105
* | | Limit the number of events sent over replication when persisting events. (#10...Brendan Abolivier2021-05-272-7/+11
* | | Merge tag 'v1.35.0rc2' into developErik Johnston2021-05-273-2/+11
|\ \ \ | | |/ | |/|
| * | 1.35.0rc2 v1.35.0rc2 github/release-v1.35.0 release-v1.35.0Erik Johnston2021-05-273-2/+10
| |/
| * Pass the origin when calculating the spaces summary over GET. (#10079)Patrick Cloke2021-05-272-1/+2
* | Fix up `BatchingQueue` (#10078)Erik Johnston2021-05-273-24/+125
* | Clarify security note regarding the domain Synapse is hosted on. (#9221)Denis Kasak2021-05-272-11/+36
* | Improve the error message printed by synctl when synapse fails to start. (#10...Richard van der Hoff2021-05-272-4/+9
* | Remove redundant, unmaintained `convert_server_keys` script. (#10055)Richard van der Hoff2021-05-272-108/+1
* | Remove redundant code to reload tls cert (#10054)Richard van der Hoff2021-05-274-25/+6
* | Combine `LruCache.invalidate` and `invalidate_many` (#9973)Richard van der Hoff2021-05-2712-52/+52
* | Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-266-49/+9
* | Fix GitHub Actions lint for newsfragments (#10069)Dan Callahan2021-05-262-0/+7
* | Tweak wording of database recommendation in INSTALL.md (#10057)Aaron Raimist2021-05-262-5/+8
* | Tell CircleCI to build Docker images from `main` (#9906)Dan Callahan2021-05-262-1/+2
* | Add an admin API for unprotecting local media from quarantine (#10040)Dirk Klimpel2021-05-265-5/+151
* | Update CAPTCHA documentation to mention turning off verify origin feature (#1...Aaron Raimist2021-05-262-22/+29
|/
* 1.35.0rc1 v1.35.0rc1Erik Johnston2021-05-2539-38/+65
* Run complement with Synapse workers manually. (#10039)Patrick Cloke2021-05-243-7/+27
* Add missing type hints to synapse.util (#9982)Patrick Cloke2021-05-249-25/+39
* Fix docker image to not log at `/homeserver.log` (#10045)Sergio Miguéns2021-05-242-1/+4
* Remove tls_fingerprints option (#9280)Jerin J Titus2021-05-246-95/+1
* Fix --no-daemonize for synctl with workers (#9995)Richard van der Hoff2021-05-242-70/+33
* Fix off-by-one-error in synapse_port_db (#9991)Richard van der Hoff2021-05-245-9/+10
* Remove `keylen` from `LruCache`. (#9993)Richard van der Hoff2021-05-2411-55/+80
* Enable experimental spaces by default. (#10011)Patrick Cloke2021-05-244-2/+35
* Add missing entry to the table of contents of room admin API (#10043)Dirk Klimpel2021-05-242-0/+2
* Fix `get_state_ids_for_event` return type typo to match what the function act...Eric Eastwood2021-05-242-1/+2
* Don't hammer the database for destination retry timings every ~5mins (#10036)Erik Johnston2021-05-2110-76/+62
* Fix /upload 500'ing when presented a very large image (#10029)Michael Telatynski2021-05-213-0/+12
* Add a test for update_presence (#10033)Andrew Morgan2021-05-212-1/+47
* Remove unused properties from the SpaceSummaryHandler. (#10038)Patrick Cloke2021-05-212-2/+1
* Fixed removal of new presence stream states (#10014)Marek Matys2021-05-212-9/+10
* Add a batching queue implementation. (#10017)Erik Johnston2021-05-213-0/+323
* Add `Keyring.verify_events_for_server` and reduce memory usage (#10018)Erik Johnston2021-05-203-22/+94
* Use ijson to parse the response to `/send_join`, reducing memory usage. (#9958)Erik Johnston2021-05-207-58/+227
* Allow a user who could join a restricted room to see it in spaces summary. (#...Patrick Cloke2021-05-204-54/+254
* Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2021-05-202-1/+2
|\
| * Update user_directory.md (#10016)Javier Junquera Sánchez2021-05-202-1/+2
* | Update the contrib grafana dashboard (#10001)Erik Johnston2021-05-192-644/+3558
* | Hardened systemd unit files (#9803)Savyasachee Jha2021-05-193-0/+102
* | Refactor checking restricted join rules (#10007)Patrick Cloke2021-05-184-51/+50
* | Use a database table to hold the users that should have full presence sent to...Andrew Morgan2021-05-1811-158/+479
* | Fix the allowed range of valid ordering characters for spaces. (#10002)Patrick Cloke2021-05-172-2/+3
* | Clarify comments in the space summary handler. (#9974)Patrick Cloke2021-05-172-5/+47
* | Merge branch 'master' into developErik Johnston2021-05-174-15/+25
|\|
| * Changelog v1.34.0 github/release-v1.34.0 release-v1.34.0Erik Johnston2021-05-171-6/+6
| * Update UPGRADE.rstErik Johnston2021-05-171-7/+4
| * 1.34.0Erik Johnston2021-05-173-3/+16
* | Split multiplart email sending into a dedicated handler (#9977)Brendan Abolivier2021-05-175-90/+122
* | Update postgres docs (#9989)Richard van der Hoff2021-05-143-103/+98
* | Run `black` on the scripts (#9981)Richard van der Hoff2021-05-148-76/+141
* | Minor `@cachedList` enhancements (#9975)Richard van der Hoff2021-05-146-20/+31
* | Remove unnecessary SystemRandom from SQLBaseStore (#9987)Dan Callahan2021-05-143-3/+3
* | Remove superfluous call to bool() (#9986)Dan Callahan2021-05-142-1/+2
* | Simplify exception handling in is_ascii. (#9985)Dan Callahan2021-05-142-3/+2
* | Use Python's secrets module instead of random (#9984)Dan Callahan2021-05-142-8/+12
* | Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-145-17/+56
* | Update minimum supported version in postgres.md (#9988)Andrew Morgan2021-05-142-1/+2
* | Update SSO mapping providers documentation about unique IDs. (#9980)Patrick Cloke2021-05-132-7/+12
|/
* Incorporate changes from review v1.34.0rc1Brendan Abolivier2021-05-121-2/+6
* Refer and link to the upgrade notes rather than to the file nameBrendan Abolivier2021-05-121-1/+1
* 1.34.0rc1Brendan Abolivier2021-05-1236-35/+62
* Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-126-12/+157
* Change the format of access tokens away from macaroons (#5588)Richard van der Hoff2021-05-129-103/+78
* Run cache_joined_hosts_for_event in background (#9951)Erik Johnston2021-05-122-5/+41
* Tests for to-device messages (#9965)Richard van der Hoff2021-05-112-0/+202
* Sort child events according to MSC1772 for the spaces summary API. (#9954)Patrick Cloke2021-05-113-2/+151
* Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-114-0/+29
* Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-115-5/+34
* Merge branch 'master' into developBrendan Abolivier2021-05-1110-70/+319
|\
| * Use link to advisory rather than to the CVE repo v1.33.2 github/release-v1.33.2 release-v1.33.2Brendan Abolivier2021-05-111-1/+1
| * 1.33.2Brendan Abolivier2021-05-114-2/+23
| * Merge pull request from GHSA-x345-32rc-8h85Richard van der Hoff2021-05-116-68/+296
* | Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-114-1/+20
* | Add debug logging for issue #9533 (#9959)Richard van der Hoff2021-05-116-2/+42
* | Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-114-26/+32
* | Improve performance of backfilling in large rooms. (#9935)Erik Johnston2021-05-102-69/+55
* | Fix port_db on empty db (#9930)Richard van der Hoff2021-05-106-54/+69
* | Always cache 'event_to_prev_state_group' (#9950)Erik Johnston2021-05-072-6/+8
* | Fix make_full_schema to create the db with the right options and user (#9931)Richard van der Hoff2021-05-072-9/+11
* | Merge remote-tracking branch 'origin/release-v1.33.2' into developErik Johnston2021-05-072-1/+2
|\|
| * Unpin attrs dep after new version has been released (#9946)Erik Johnston2021-05-072-1/+2
* | Reorganise the database schema directories (#9932)Richard van der Hoff2021-05-07284-47/+81
* | Export jemalloc stats to prometheus when used (#9882)Erik Johnston2021-05-064-0/+200
* | Revert "Leave out optional keys from /sync (#9919)" (#9940)Erik Johnston2021-05-064-51/+50
* | Merge remote-tracking branch 'origin/master' into developErik Johnston2021-05-064-2/+18
|\|
| * 1.33.1 v1.33.1 github/release-v1.33.1 release-v1.33.1Erik Johnston2021-05-064-2/+16
| * Pin attrs to <21.1.0 (#9937)Erik Johnston2021-05-062-1/+3
* | Follow-up to #9915 to correct the identifier for room types.Patrick Cloke2021-05-051-1/+1
* | Include the time of the create event in Spaces Summary. (#9928)Patrick Cloke2021-05-052-0/+2
* | Increase perf of handling presence when joining large rooms. (#9916)Erik Johnston2021-05-053-82/+87
* | Support stable MSC1772 spaces identifiers. (#9915)Patrick Cloke2021-05-053-2/+10
* | Optionally track memory usage of each LruCache (#9881)Erik Johnston2021-05-058-1/+97
* | Limit how often GC happens by time. (#9902)Erik Johnston2021-05-056-3/+63
* | Don't set the external cache if its been done recently (#9905)Erik Johnston2021-05-053-5/+34
* | Use get_current_users_in_room from store and not StateHandler (#9910)Erik Johnston2021-05-0512-17/+26
* | Docker healthcheck timings - add startup delay and changed interval (#9913)Christopher May-Townsend2021-05-053-4/+16
* | Leave out optional keys from /sync (#9919)DeepBlueV7.X2021-05-054-50/+51
* | Merge branch 'master' into developBrendan Abolivier2021-05-054-4/+20
|\|
| * 1.33.0 v1.33.0 github/release-v1.33.0 release-v1.33.0Brendan Abolivier2021-05-054-2/+16
| * Build Debian packages for Ubuntu 21.04 Hirsute (#9909)Dan Callahan2021-04-302-3/+5
* | Time external cache response time (#9904)Erik Johnston2021-05-042-10/+27
* | Add port parameter to the sample config for psycopg2 args (#9911)Andrew Morgan2021-05-043-0/+3
* | Merge tag 'v1.33.0rc2' into developAndrew Morgan2021-04-293-2/+10
|\|
| * typo in changelog v1.33.0rc2Andrew Morgan2021-04-291-1/+1
| * 1.33.0rc2Andrew Morgan2021-04-293-2/+10
* | Add missing type hints to handlers and fix a Spam Checker type hint. (#9896)Patrick Cloke2021-04-298-54/+82
* | Delete room endpoint (#9889)ThibF2021-04-295-64/+128
* | Merge remote-tracking branch 'origin/release-v1.33.0' into developErik Johnston2021-04-283-1/+46
|\|
| * Fix tight loop handling presence replication. (#9900)Erik Johnston2021-04-283-1/+46
* | Use the parent's logging context name for runWithConnection. (#9895)Patrick Cloke2021-04-282-1/+4
* | Merge tag 'v1.33.0rc1' into developAndrew Morgan2021-04-2841-173/+147
|\|
| * Reword account validity template change to sound less like a bugfix v1.33.0rc1Andrew Morgan2021-04-281-1/+1
| * 1.33.0rc1Andrew Morgan2021-04-2836-35/+54
| * Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-285-138/+93
* | Reduce memory footprint of caches (#9886)Erik Johnston2021-04-282-18/+60
* | Add type hints to presence handler (#9885)Erik Johnston2021-04-282-70/+90
|/
* Remove various bits of compatibility code for Python <3.6 (#9879)Andrew Morgan2021-04-2716-98/+29
* Pass errors back to the client when trying multiple federation destinations. ...Patrick Cloke2021-04-272-58/+61
* Use current state table for `presence.get_interested_remotes` (#9887)Erik Johnston2021-04-272-7/+3
* Improved validation for received requests (#9817)Richard van der Hoff2021-04-2315-31/+174
* Kill off `_PushHTTPChannel`. (#9878)Richard van der Hoff2021-04-233-121/+20
* Allow OIDC cookies to work on non-root public baseurls (#9726)Andrew Morgan2021-04-233-9/+22
* pass a reactor into SynapseSite (#9874)Richard van der Hoff2021-04-237-24/+43
* Add type hints to auth and auth_blocking. (#9876)Patrick Cloke2021-04-234-44/+48
* Make DomainSpecificString an attrs class (#9875)Erik Johnston2021-04-234-8/+24
* Remove room and user invite ratelimits in default unit test config (#9871)Andrew Morgan2021-04-232-0/+5
* Split presence out of master (#9820)Erik Johnston2021-04-2317-245/+245
* Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-236-68/+131
* Only store data in caches, not "smart" objects (#9845)Erik Johnston2021-04-233-141/+182
* Limit the size of HTTP responses read over federation. (#9833)Richard van der Hoff2021-04-234-8/+110
* Handle all new rate limits in demo scripts (#9858)manuroe2021-04-222-12/+43
* Limit length of accepted email addresses (#9855)Erik Johnston2021-04-226-7/+100
* Clear the resync bit after resyncing device lists (#9867)Richard van der Hoff2021-04-223-10/+17
* Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-2226-62/+77
* Merge branch 'master' into developAndrew Morgan2021-04-224-4/+30
|\
| * Merge tag 'v1.32.2'Andrew Morgan2021-04-224-4/+30
| |\
| | * A regression can't be introduced twice v1.32.2 github/release-v1.32.2 release-v1.32.2Andrew Morgan2021-04-221-2/+2
| | * Note regression was in 1.32.0 and 1.32.1Andrew Morgan2021-04-221-2/+2
| | * Update dates in changelogsAndrew Morgan2021-04-212-2/+2
| | * 1.32.2Andrew Morgan2021-04-214-2/+18
| | * Merge branch 'release-v1.32.1' of github.com:matrix-org/synapse into release-...Andrew Morgan2021-04-212-9/+16
| | |\
| | * | Make LoggingContext's name optional (#9857)Richard van der Hoff2021-04-212-3/+13
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2021-04-212-9/+16
|\| | |
| * | | Merge branch 'release-v1.32.1' of github.com:matrix-org/synapseAndrew Morgan2021-04-212-9/+16
| |\ \ \ | | | |/ | | |/|