Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e507f9430496225b457220ff16ca916d1ac319bf..edfd387abad0782b71b6af3401935aad2df2ef37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ tmp
 *~
 doc
 .vagrant
+.ruby-gemset
+.ruby-version
+.idea
\ No newline at end of file