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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 74094e8b3b468cb3ec6f02fa5f6daeb61c8f449b..5ba4bc764093feadbe0fe7ac4219e1f6089c1321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,18 @@
+*~
+.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

+public/assets
+public/attachments
+public/export

 tmp
 tmp