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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e507f9430496225b457220ff16ca916d1ac319bf..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
@@ -8,3 +9,7 @@ tmp
 *~
 doc
 .vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage