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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1a2d35c6a28cc056de2646690384138a52a03caf..380a88047f9ad35e43edb8abe354958e78fdadbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,26 @@
-log
-config/piwik.yml
+*~
+.DS_Store
+.bundle/config
+.idea
+.local-overcommit.yml
+.ruby-gemset
+.ruby-version
+.vagrant

 app/assets/javascripts/i18n
 app/assets/javascripts/i18n

+config/credentials.yml.enc
+config/master.key
+config/environments/*.local.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
-.vagrant
-.ruby-gemset
-.ruby-version
-.idea
-coverage
+
+# docker-compose database directory
+docker-db-data