diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 21:51:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 21:51:16 +0200 |
| commit | 665eb1affe7ba765af476e6f00096aad3af70735 (patch) | |
| tree | 20fbd695cfc9bad551abead27a80fdb0e19567b9 /.gitignore | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | f60c78ff3e42e321b457a7d63868b49bf56adfda (diff) | |
Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 9f6c4b413..4545270b3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,36 +17,36 @@ /log/* !/log/.keep /tmp -coverage -public/system -public/assets -public/packs -public/packs-test +/coverage +/public/system +/public/assets +/public/packs +/public/packs-test .env .env.production .env.development -node_modules/ -build/ +/node_modules/ +/build/ # Ignore Vagrant files .vagrant/ # Ignore Capistrano customizations -config/deploy/* +/config/deploy/* # Ignore IDE files .vscode/ .idea/ # Ignore postgres + redis + elasticsearch volume optionally created by docker-compose -postgres -redis -elasticsearch +/postgres +/redis +/elasticsearch # ignore Helm lockfile, dependency charts, and local values file -chart/Chart.lock -chart/charts/*.tgz -chart/values.yaml +/chart/Chart.lock +/chart/charts/*.tgz +/chart/values.yaml # Ignore Apple files .DS_Store |