Merge branch 'develop' into stable

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 62ca61bce780d92f3ffdbb71093d76a40488b025..8821d8ce106287131f48d61fb323aef91b346956 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 # App artifacts
+docs/site
+*.zip
+*.sw*
+secret
 /_build
 /db
 /deps
@@ -13,6 +17,14 @@
 /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/*
@@ -28,11 +40,12 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/runtime.exs
 /config/*.env
 
 
 # Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db*.psql
 
 .DS_Store
 .env
@@ -53,3 +66,15 @@ pleroma.iml
 
 # asdf
 .tool-versions
+
+# Editor temp files
+/*~
+/*#
+
+# Generated documentation
+docs/site
+docs/venv
+
+# docker stuff
+docker-db
+*.iml