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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9..920ca1120ba51aa6171900e39560d36c48d1343f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,14 @@
 log
+config/piwik.yml
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
 *~
 doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage