Fixes: #12534

Signed-off-by: Dirk Klimpel <dirk@klimpel.org>

Part of my continuing quest to make the docker images build quicker: copy nginx and redis in from base docker images, rather than apt installing each time.

Co-authored-by: MattC <buffless-matt@users.noreply.github.com>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>

In Jaeger:

 - Before: huge list of uncategorized database calls
 - After: nice and collapsible into units of work

Signed-off-by: Andrew Doh <andrewddo@gmail.com>
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Co-authored-by: Andrew Morgan <andrewm@element.io>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>

* Improved section regarding server admin

Added steps describing how to elevate an existing user to administrator by manipulating a `postgres` database.

Signed-off-by: jejo86 <28619134+jejo86@users.noreply.github.com>

* Improved section regarding server admin

* Reference database settings

Add instructions to check database settings to find out the database name, instead of listing all available PostgreSQL databases.

* Add suggestions from PR conversation

Replace config filename `homeserver.yaml`. with "config file".
Remove instructions to switch to `postgres` user.
Add instructions how to connect to SQLite database.

* Update changelog.d/13230.doc

Co-authored-by: reivilibre <olivier@librepush.net>

* Update doc for setting `macaroon_secret_key`

* newsfile

Co-authored-by: MattC <buffless-matt@users.noreply.github.com>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>

Fixes: #13053

Fixes: #13433

Add a `merge-back` command to the release script, which automates merging the correct branches after a release. (#13393)

so that we raise the intended error instead.

Signed-off-by: Sean Quah <seanq@matrix.org>

#13404 removed an import of `Optional` which was still needed
due to #13413 added more usages.

Previously, `_resolve_state_at_missing_prevs` returned the resolved
state before an event and a partial state flag. These were unwieldy to
carry around would only ever be used to build an event context. Build
the event context directly instead.

Signed-off-by: Sean Quah <seanq@matrix.org>

Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>

Make sure that we re-check the auth rules during state resync, otherwise
rejected events get un-rejected.

Synapse 1.64.0rc2 (2022-07-29)
==============================

This RC reintroduces support for `account_threepid_delegates.email`, which was removed in 1.64.0rc1. It remains deprecated and will be removed altogether in a future release. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))

Reverts commit fa71bb18, and tweaks documentation.

Signed-off-by: 3nprob <git@3n.anonaddy.com>

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

Implements MSC3848

Make minor clarifications to the error messages given when we fail to join a room via any server. (#13160)

Extend the release script to automatically push a new SyTest branch, rather than having that be a manual process. (#12978)

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>