aboutsummaryrefslogtreecommitdiffstats
path: root/Rails.gitignore
diff options
context:
space:
mode:
authorCarl Suster <code@contraflo.ws>2013-11-10 21:12:01 +1100
committerCarl Suster <code@contraflo.ws>2013-11-10 21:12:01 +1100
commit0ac2f7cb820bf31e15e174d4061a8792686e629e (patch)
tree427cdeeaee63531866267d6340a3a857e359463a /Rails.gitignore
parentd72190c56ad3bc913fe62b43cd8b5b2281a6b7cc (diff)
downloadgitignore-0ac2f7cb820bf31e15e174d4061a8792686e629e.tar.gz
gitignore-0ac2f7cb820bf31e15e174d4061a8792686e629e.zip
Optionally ignore ruby env normalisation files, with comments
Diffstat (limited to 'Rails.gitignore')
-rw-r--r--Rails.gitignore15
1 files changed, 12 insertions, 3 deletions
diff --git a/Rails.gitignore b/Rails.gitignore
index 2c74f70f..2debe997 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -3,9 +3,6 @@
.sass-cache
capybara-*.html
.rspec
-.rvmrc
-/.bundle
-/vendor/bundle
/log
/tmp
/db/*.sqlite3
@@ -16,3 +13,15 @@ capybara-*.html
rerun.txt
pickle-email-*.html
config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should be checked in to normalise the environment:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc