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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021bc9be273ff5d4456244db843fbb58d5407cd9..17112bf8a48d4f21aea2c4a7c6c79fae37724f64 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,19 @@
 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
+
+config/settings.local.yml
+config/settings/*.local.yml
+config/environments/*.local.yml