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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 837249e00a04b432e8b8577d1d5be5b21a149c44..73316769e63ae7989ff9507682a1011cdf9db21a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,23 @@
-log
+*~
+.DS_Store
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml

 config/piwik.yml
 config/piwik.yml

+config/settings.local.yml
+config/settings/*.local.yml
+coverage
+doc
+log
+node_modules

 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export

+storage

 tmp
 tmp

-.DS_Store
-*~
-doc
+
+# docker-compose database directory
+docker-db-data