Переглянути джерело

Optionally ignore ruby env normalisation files, with comments

Carl Suster 11 роки тому
батько
коміт
0ac2f7cb82
2 змінених файлів з 25 додано та 5 видалено
  1. 12 3
      Rails.gitignore
  2. 13 2
      Ruby.gitignore

+ 12 - 3
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

+ 13 - 2
Ruby.gitignore

@@ -1,10 +1,8 @@
 *.gem
 *.rbc
-.bundle
 .config
 coverage
 InstalledFiles
-lib/bundler/man
 pkg
 rdoc
 spec/reports
@@ -16,3 +14,16 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+## Environment normalisation:
+.bundle
+lib/bundler/man
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc