Skip to content

Commit 0ac2f7c

Browse files
committed
Optionally ignore ruby env normalisation files, with comments
1 parent d72190c commit 0ac2f7c

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

Rails.gitignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
.sass-cache
44
capybara-*.html
55
.rspec
6-
.rvmrc
7-
/.bundle
8-
/vendor/bundle
96
/log
107
/tmp
118
/db/*.sqlite3
@@ -16,3 +13,15 @@ capybara-*.html
1613
rerun.txt
1714
pickle-email-*.html
1815
config/initializers/secret_token.rb
16+
17+
## Environment normalisation:
18+
/.bundle
19+
/vendor/bundle
20+
21+
# these should be checked in to normalise the environment:
22+
# Gemfile.lock
23+
# .ruby-version
24+
# .ruby-gemset
25+
26+
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
27+
.rvmrc

Ruby.gitignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
*.gem
22
*.rbc
3-
.bundle
43
.config
54
coverage
65
InstalledFiles
7-
lib/bundler/man
86
pkg
97
rdoc
108
spec/reports
@@ -16,3 +14,16 @@ tmp
1614
.yardoc
1715
_yardoc
1816
doc/
17+
18+
## Environment normalisation:
19+
.bundle
20+
lib/bundler/man
21+
22+
# for a library or gem, you might want to ignore these files since the code is
23+
# intended to run in multiple environments; otherwise, check them in:
24+
# Gemfile.lock
25+
# .ruby-version
26+
# .ruby-gemset
27+
28+
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
29+
.rvmrc

0 commit comments

Comments
 (0)