Merge remote-tracking branch 'origin/develop' into feature/bbs

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 72fe2ce430dab93a386bd72e391b3ea79375caf3..082c7491b6c15dcbd4779005a7dc2989b2c9d554 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
 /.elixir_ls
 /test/fixtures/test_tmp.txt
@@ -11,6 +10,7 @@
 /test/tmp/
 /doc
 /instance
+/priv/ssh_keys
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -25,6 +25,7 @@ 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
@@ -34,3 +35,6 @@ erl_crash.dump
 
 # Editor config
 /.vscode/
+
+# Prevent committing docs files
+/priv/static/doc/*