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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6bfe6b19e3753a35e40496a9f2b2ab1722f65055..1328658c6ab5b70d2809f6c665e51ff05b447514 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +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
+node_modules
+public/assets
+public/attachments
+public/export
+storage
+tmp