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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 74094e8b3b468cb3ec6f02fa5f6daeb61c8f449b..1a2d35c6a28cc056de2646690384138a52a03caf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,15 @@
 log
+config/piwik.yml
+app/assets/javascripts/i18n
+public/assets
+public/attachments
+public/export
 tmp
+.DS_Store
+*~
+doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage