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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 837249e00a04b432e8b8577d1d5be5b21a149c44..1a2d35c6a28cc056de2646690384138a52a03caf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 log
 config/piwik.yml
+app/assets/javascripts/i18n
 public/assets
 public/attachments
 public/export
@@ -7,3 +8,8 @@ tmp
 .DS_Store
 *~
 doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage