Merge branch 'develop' into stable

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6f1e495de0527a09820dc3b9c48ca6aa3e8e0b0a..8821d8ce106287131f48d61fb323aef91b346956 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 # App artifacts
+docs/site
+*.zip
+*.sw*
 secret
 /_build
 /db
@@ -14,6 +17,14 @@ secret
 /doc
 /instance
 /priv/ssh_keys
+vm.args
+.cache/
+.hex/
+.mix/
+.psql_history
+docker-resources/Dockerfile
+docker-resources/Caddyfile
+pgdata
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -29,6 +40,7 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/runtime.exs
 /config/*.env
 
 
@@ -54,3 +66,15 @@ pleroma.iml
 
 # asdf
 .tool-versions
+
+# Editor temp files
+/*~
+/*#
+
+# Generated documentation
+docs/site
+docs/venv
+
+# docker stuff
+docker-db
+*.iml