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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021bc9be273ff5d4456244db843fbb58d5407cd9..920ca1120ba51aa6171900e39560d36c48d1343f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,14 @@
 log
 log

+config/piwik.yml

 public/assets
 public/attachments
 public/assets
 public/attachments

+public/export

 tmp
 .DS_Store
 tmp
 .DS_Store

+*~
+doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage