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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b0c7d3614100edebfe6b28a607599e70d58daab..8fca0b41aa9a8531c4062b767f6ae3dab1891960 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,21 @@
 # App artifacts
+*.sw*
+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
+vm.args
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -26,9 +31,12 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/runtime.exs
+/config/*.env
+
 
 # Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db*.psql
 
 .DS_Store
 .env
@@ -47,3 +55,9 @@ docs/generated_config.md
 .idea
 pleroma.iml
 
+# asdf
+.tool-versions
+
+# Editor temp files
+/*~
+/*#