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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2e7dfe16e7b101f26c708360b2bea178062a91dc..5ba4bc764093feadbe0fe7ac4219e1f6089c1321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +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
 public/assets
 public/attachments
+public/export
 tmp
-.DS_Store
-*~