Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 72fe2ce430dab93a386bd72e391b3ea79375caf3..66d1376c53f173e3c5af516b9615cdcd839218f7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,18 @@
 # App artifacts
+secret
 /_build
 /db
 /deps
 /*.ez
-/uploads
 /test/uploads
 /.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
 /test/fixtures/test_tmp.txt
 /test/fixtures/image_tmp.jpg
 /test/tmp/
 /doc
 /instance
+/priv/ssh_keys
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -25,6 +27,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 +37,17 @@ erl_crash.dump
 
 # Editor config
 /.vscode/
+
+# Prevent committing docs files
+/priv/static/doc/*
+docs/generated_config.md
+
+# Code test coverage
+/cover
+/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# asdf
+.tool-versions