diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
| commit | 45deca65b3fb8e9f19818e3db7d315cab0572d1a (patch) | |
| tree | 1b9bab6ec764e8a6600d245595facd5694287e16 /.gitignore | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | 6d23d40420e4548778f3ca4ed9e8cb16e0eb0073 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.
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 |