projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
[akkoma]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 8166e65e9081f20399a73ffb6f4129935e2e84eb..da73b6f361d2538265d19631fee046777d4ec734 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-3,14
+3,16
@@
/db
/deps
/*.ez
/db
/deps
/*.ez
-/
uploads
+/
test/instance
/test/uploads
/.elixir_ls
/test/uploads
/.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
/doc
/instance
/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/*
# Prevent committing custom emojis
/priv/static/emoji/custom/*
@@
-26,9
+28,12
@@
erl_crash.dump
# variables.
/config/*.secret.exs
/config/generated_config.exs
# variables.
/config/*.secret.exs
/config/generated_config.exs
+/config/runtime.exs
+/config/*.env
+
# Database setup file, some may forget to delete it
# Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db
*
.psql
.DS_Store
.env
.DS_Store
.env
@@
-38,5
+43,18
@@
erl_crash.dump
# Prevent committing docs files
/priv/static/doc/*
# Prevent committing docs files
/priv/static/doc/*
+docs/generated_config.md
+# Code test coverage
/cover
/cover
+/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# asdf
+.tool-versions
+
+# Editor temp files
+/*~
+/*#