diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
| commit | e68bfaf1fe1a7890a67af6f444281185f507cf9e (patch) | |
| tree | 5e73caccdcdd65d0ac97f9eb92195928f30925f2 /ci/ci_build.rb | |
| parent | ef6462c73003b28c8e060a06120abb9cd67b6d52 (diff) | |
| parent | 16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff) | |
| download | rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.gz rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.bz2 rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
Diffstat (limited to 'ci/ci_build.rb')
| -rwxr-xr-x | ci/ci_build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 0c7dd837b1..2a7bbc376e 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -19,7 +19,7 @@ puts "[CruiseControl] Rails build" build_results = {} # Install required version of bundler. -bundler_install_cmd = "gem install bundler -v 0.9.3 --no-ri --no-rdoc" +bundler_install_cmd = "sudo gem install bundler -v 0.9.10 --no-ri --no-rdoc" puts "Running command: #{bundler_install_cmd}" build_results[:install_bundler] = system bundler_install_cmd |