summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2023-07-03 10:39:52 +0000
committerGitHub <noreply@github.com>2023-07-03 11:39:52 +0100
commitcd8b73aa97cb6d06079f67aa73ff24679038d7c6 (patch)
tree1dd87f71e51ea2ac65cf18e3dc013ede762a844c /.gitignore
parentAdd a timeout that aborts any Postgres statement taking more than 1 hour. (#1... (diff)
downloadsynapse-cd8b73aa97cb6d06079f67aa73ff24679038d7c6.tar.xz
Fix the `devenv up` configuration which was ignoring the config overrides. (#15854)
* Fix use of config override directory in `devenv up`

`--config-directory` is for the generate config script; `-c` is for usage

* Add homeserver config override directory to gitignore

* Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>

---------

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8cf504324b..a89f149ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ __pycache__/
 /logs
 /media_store/
 /uploads
+/homeserver-config-overrides.d
 
 # For direnv users
 /.envrc