Merge remote-tracking branch 'upstream/pull/3675'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 386f0513af861f01cb92952a2cb6e2306346e799..75e9eb59e73fe2fb5dfe474e590dfed8fd748c67 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 .vagrant
 app/assets/javascripts/i18n
 config/environments/*.local.yml
 .vagrant
 app/assets/javascripts/i18n
 config/environments/*.local.yml

-config/piwik.yml

 config/settings.local.yml
 config/settings/*.local.yml
 coverage
 config/settings.local.yml
 config/settings/*.local.yml
 coverage


@@ -16,4 +15,8 @@ node_modules
 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export

+storage

 tmp
 tmp

+
+# docker-compose database directory
+docker-db-data