synapse/changelog.d
Eric Eastwood 631eed91f1
Fix bad merge with start_background_tasks (#19013)
This was originally removed in
https://github.com/element-hq/synapse/pull/18886 but it looks like it
snuck back in https://github.com/element-hq/synapse/pull/18828 during a
[bad
merge](4cd3d9172e).

Noticed while looking at Synapse setup and startup (just by happen
stance).

I don't think this has adverse effects on Synapse actually working and
`start_background_tasks()` can be called multiple times.


### Is there a good way to audit all of these merges?

As I would like to see the conflicts for each merge.

This works but it's still hard to notice anything is wrong:

```
git log --remerge-diff <commit-sha>
```

> shows the difference from mechanical merge result and the result that
is actually recorded in a merge commit

via
https://stackoverflow.com/questions/15277708/how-do-you-see-show-a-git-merge-conflict-resolution-that-was-done-given-a-mer/71181334#71181334

The following better. Specify the version range to the commit right
before the merge to the merge. And can even specify which file to look
at to make it more obvious with the hindsight we have now.

```
git log --remerge-diff <merge-commit-sha>~1..<merge-commit-sha> -- synapse/server.py
```

Example:
```
git log --remerge-diff 4cd3d9172ed7b87e509746851a376c861a27820e~1..4cd3d9172ed7b87e509746851a376c861a27820e -- synapse/server.py
```
2025-10-07 13:29:22 -05:00
..
.gitignore
17097.misc Validate the body of requests to /keys/upload (#17097) 2025-10-07 11:27:53 +01:00
18721.bugfix Document and fix room_config param when user_may_create_room callback is invoked for a room upgrade (#18721) 2025-09-24 21:42:19 +00:00
18767.misc Updated providers.json to use X instead of Twitter following rebrand and schema change (#18767) 2025-09-26 11:06:50 +01:00
18828.feature Cleanly shutdown SynapseHomeServer object (#18828) 2025-10-01 02:42:09 +00:00
18868.misc Fix server_name in logging context for multiple Synapse instances in one process (#18868) 2025-09-26 17:10:48 -05:00
18903.misc Wrap the Rust HTTP client with make_deferred_yieldable (#18903) 2025-10-02 13:00:50 -05:00
18911.feature Add an Admin API to query a piece of local or cached remote media by ID (#18911) 2025-09-23 16:25:56 -05:00
18913.misc Fix triage_labelled GHA workflow (#18913) 2025-09-24 14:17:14 +01:00
18914.doc Explain how Deferred callbacks interact with logcontexts (#18914) 2025-09-24 16:20:42 -05:00
18932.misc Disconnect background process work from request trace (#18932) 2025-09-25 21:45:18 -05:00
18934.feature Use signature support from policy servers when available (#18934) 2025-09-25 19:30:24 +00:00
18939.misc Bump batch size from 50 to 1000 for _get_e2e_cross_signing_signatures_for_devices query (#18939) 2025-09-23 15:47:29 +01:00
18947.misc Update MSC4326 error code (#18947) 2025-09-24 11:57:24 +01:00
18948.bugfix fix: Compute user last seen timestamp from last seen devices (#18948) 2025-09-24 11:59:11 +01:00
18959.misc Fix no active span when trying to log tracing error on startup (#18959) 2025-09-24 10:12:08 -05:00
18964.misc Fix run_coroutine_in_background(...) incorrectly handling logcontext (#18964) 2025-09-24 15:24:47 +00:00
18966.misc Add debug logs wherever we change current logcontext (#18966) 2025-10-02 11:51:17 -05:00
18971.misc Update URLs in dockerfile metadata (#18971) 2025-09-26 12:40:50 +01:00
18973.misc Note optional Element Commecial License in SPDX specifiers (#18973) 2025-09-26 12:43:07 +01:00
18974.misc Fix logcontext handling in timeout_deferred tests (#18974) 2025-09-26 11:10:02 -05:00
18988.misc Remove internal ReplicationUploadKeysForUserRestServlet (#18988) 2025-09-30 11:12:14 +01:00
18989.removal Remove deprecated LoggingContext.set_current_context/LoggingContext.current_context methods (#18989) 2025-10-02 13:21:37 -05:00
18990.misc Switch task scheduler from raw logcontext manipulation (set_current_context) to utils (PreserveLoggingContext) (#18990) 2025-10-02 10:22:25 -05:00
18992.misc Remove MockClock() (#18992) 2025-09-30 11:27:29 -05:00
18996.removal Remove unstable prefixes for MSC2732: Olm fallback keys (#18996) 2025-10-07 11:15:35 +01:00
18998.doc Fix rc_room_creation and rc_reports docs - remove per_user typo (#18998) 2025-09-30 15:17:11 -05:00
19002.bugfix Fix bug where ephemeral events were not filtered by room ID (#19002) 2025-10-03 13:19:57 +01:00
19007.misc Revert "Switch to OpenTracing's ContextVarsScopeManager (#18849)" (#19007) 2025-10-02 11:27:26 -05:00
19011.bugfix Align Synapse version string to use SYNAPSE_VERSION (#19011) 2025-10-07 10:44:56 -05:00
19012.misc No need to have version_string as an argument since it's always the same (#19012) 2025-10-07 13:27:24 -05:00
19013.misc Fix bad merge with start_background_tasks (#19013) 2025-10-07 13:29:22 -05:00
19023.bugfix Update KeyUploadServlet to handle case where client sends device_keys: null (#19023) 2025-10-07 16:23:55 +01:00