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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 17112bf8a48d4f21aea2c4a7c6c79fae37724f64..444dc99c9c1cc38a1184c75778de5e916fad7977 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,25 @@
-log
-config/piwik.yml
+*~
+.DS_Store
+.bundle/config
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
 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
+storage
 tmp
-.DS_Store
-*~
-doc
-.vagrant
-.ruby-gemset
-.ruby-version
-.idea
-coverage
 
-config/settings.local.yml
-config/settings/*.local.yml
-config/environments/*.local.yml
+# docker-compose database directory
+docker-db-data