Merge branch 'stable' into mergeback/2.2.1

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 774893b35f2a9a432738a33614fe17b4d001f6fb..6ae21e9144f410f289fc0734b714bfcbd7226aac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,15 @@
 /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/*
@@ -26,6 +27,8 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/*.env
+
 
 # Database setup file, some may forget to delete it
 /config/setup_db.psql
@@ -38,3 +41,14 @@ erl_crash.dump
 
 # Prevent committing docs files
 /priv/static/doc/*
+docs/generated_config.md
+
+# Code test coverage
+/cover
+/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# asdf
+.tool-versions