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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index a1e79e4be2a7a34ac0211ad65ae0df60cda1cb96..d1d7977f11d2ed0dc22f0748aed8f069a543915f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
 # App artifacts
+secret
 /_build
 /db
 /deps
 /*.ez
+/test/instance
 /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 +29,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
@@ -37,3 +43,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