diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-18 14:34:18 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-18 14:34:18 -0700 |
| commit | aaff90ac7f4d7d796c0a420f660dc11fd4791f51 (patch) | |
| tree | 052be907863a44d4ea3cbb1bca13100dba74ce9c /load_paths.rb | |
| parent | b475f74da5ec2ac4048f70d9063a1d4c0d63b546 (diff) | |
| parent | e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72 (diff) | |
| download | rails-aaff90ac7f4d7d796c0a420f660dc11fd4791f51.tar.gz rails-aaff90ac7f4d7d796c0a420f660dc11fd4791f51.tar.bz2 rails-aaff90ac7f4d7d796c0a420f660dc11fd4791f51.zip | |
Merge pull request #2141 from joshk/master
Config files to get Rails on Travis-CI
Diffstat (limited to 'load_paths.rb')
| -rw-r--r-- | load_paths.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/load_paths.rb b/load_paths.rb index 590af69330..17f5ce180d 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -1,8 +1,4 @@ # bust gem prelude -if defined? Gem - gem 'bundler' -else - require 'rubygems' -end +require 'rubygems' unless defined? Gem require 'bundler' -Bundler.setup +Bundler.setup
\ No newline at end of file |