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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 198e801399757dda814145f3458d194f88bb363d..cb1ba45a8e6d8108ee56a82e0176cc8145c09e55 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,13 @@
 # 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/
@@ -26,9 +29,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
@@ -49,3 +55,7 @@ pleroma.iml
 
 # asdf
 .tool-versions
+
+# Editor temp files
+/*~
+/*#