Merge develop

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5211b4c93fd44274e9e8362fccbd8d69d00696ad..06107eaf1e259212aa1efeff5e34ae4a30814ed5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,16 @@
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
+/.elixir_ls
+/test/fixtures/test_tmp.txt
+/test/fixtures/image_tmp.jpg
+/test/tmp/
+/doc
+/instance
+
+# Prevent committing custom emojis
+/priv/static/emoji/custom/*
 
 # Generated on crash by the VM
 erl_crash.dump
@@ -16,3 +24,18 @@ erl_crash.dump
 # secrets files as long as you replace their contents by environment
 # variables.
 /config/*.secret.exs
+/config/generated_config.exs
+
+# Database setup file, some may forget to delete it
+/config/setup_db.psql
+
+.DS_Store
+.env
+
+# Editor config
+/.vscode/
+
+# Prevent committing docs files
+/priv/static/doc/*
+
+/cover