diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-17 14:41:53 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-17 14:41:53 -0800 |
| commit | a437986f433a775c7c370ad3f0273938015699df (patch) | |
| tree | cc9e4bb7a491329b8b2e7e7ee3a99ef2492c604d | |
| parent | d57d8098fc269a26ea0051a9027a33af1a9a4b2b (diff) | |
| download | rails-a437986f433a775c7c370ad3f0273938015699df.tar.gz rails-a437986f433a775c7c370ad3f0273938015699df.tar.bz2 rails-a437986f433a775c7c370ad3f0273938015699df.zip | |
allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Gemfile | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index aa14cee911..52a431867c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # Check out http://help.github.com/ignore-files/ for how to set that up. debug.log +.Gemfile /.bundle /.rbenv-version /.rvmrc @@ -36,13 +36,11 @@ gem "memcache-client", ">= 1.8.5" platforms :mri_18 do gem "system_timer" - gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS'] gem "json" end -platforms :mri_19 do - gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] || RUBY_VERSION >= "2.0" -end +# Add your own local bundler stuff +instance_eval File.read ".Gemfile" if File.exists? ".Gemfile" platforms :mri do group :test do @@ -69,7 +67,6 @@ platforms :ruby do end platforms :jruby do - gem "ruby-debug", ">= 0.10.3" gem "json" gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0" |