diff options
author | Erik Johnston <erik@matrix.org> | 2019-02-25 15:08:18 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-02-25 15:08:18 +0000 |
commit | 4b9e5076c40964a967a48a2c02623c81a43265aa (patch) | |
tree | ae977487f07c0e64e406ada53655b3f69edb664e /.gitignore | |
parent | Docs and arg name clarification (diff) | |
parent | Merge pull request #4723 from matrix-org/erikj/frontend_proxy_exception (diff) | |
download | synapse-4b9e5076c40964a967a48a2c02623c81a43265aa.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 83 |
1 files changed, 30 insertions, 53 deletions
diff --git a/.gitignore b/.gitignore index 3b2252ad8a..a20f3e615d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,59 +1,36 @@ -*.pyc -.*.swp +# filename patterns *~ -*.lock - -.DS_Store -_trial_temp/ -_trial_temp*/ -logs/ -dbs/ +.*.swp +.#* +*.deb *.egg -dist/ -docs/build/ *.egg-info - -cmdclient_config.json -homeserver*.db -homeserver*.log -homeserver*.log.* -homeserver*.pid -homeserver*.yaml - -*.signing.key -*.tls.crt -*.tls.dh -*.tls.key - -.coverage -htmlcov - -demo/*/*.db -demo/*/*.log -demo/*/*.log.* -demo/*/*.pid -demo/media_store.* -demo/etc - -uploads -cache - -.idea/ -media_store/ - +*.lock +*.pyc *.tac +_trial_temp/ +_trial_temp*/ -build/ -venv/ -venv*/ -*venv/ - -localhost-800*/ -static/client/register/register_config.js -.tox - -env/ -*.config +# stuff that is likely to exist when you run a server locally +/*.signing.key +/*.tls.crt +/*.tls.key +/uploads +/media_store/ + +# IDEs +/.idea/ +/.ropeproject/ +/.vscode/ + +# build products +/.coverage* +!/.coveragerc +/.tox +/build/ +/coverage.* +/dist/ +/docs/build/ +/htmlcov +/pip-wheel-metadata/ -.vscode/ -.ropeproject/ |