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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9..1328658c6ab5b70d2809f6c665e51ff05b447514 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,20 @@
+*~
+.DS_Store
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml
+config/piwik.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