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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9..75e9eb59e73fe2fb5dfe474e590dfed8fd748c67 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,22 @@
+*~
+.DS_Store
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml
+config/settings.local.yml
+config/settings/*.local.yml
+coverage
+doc

 log
 log

+node_modules

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

+public/export
+storage

 tmp
 tmp

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