Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 06107eaf1e259212aa1efeff5e34ae4a30814ed5..599b52b9e0b8f2084a889bb9aca56ca0dec76e01 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,13 @@
 /*.ez
 /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/*
@@ -37,5 +39,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