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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b8b7bd68ae25333db8773682be1566e03bcd1c7..444dc99c9c1cc38a1184c75778de5e916fad7977 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,25 @@
+*~
+.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
+
+# docker-compose database directory
+docker-db-data