projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 774893b35f2a9a432738a33614fe17b4d001f6fb..2fce38981d3f28c03bca071b7692c986a9a19b36 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,9
+1,9
@@
# App artifacts
# App artifacts
+secret
/_build
/db
/deps
/*.ez
/_build
/db
/deps
/*.ez
-/uploads
/test/uploads
/.elixir_ls
/test/fixtures/test_tmp.txt
/test/uploads
/.elixir_ls
/test/fixtures/test_tmp.txt
@@
-11,6
+11,7
@@
/test/tmp/
/doc
/instance
/test/tmp/
/doc
/instance
+/priv/ssh_keys
# Prevent committing custom emojis
/priv/static/emoji/custom/*
# Prevent committing custom emojis
/priv/static/emoji/custom/*
@@
-38,3
+39,12
@@
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
+/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+