Merge branch 'master' into rails_3_1

Conflicts: Gemfile
2011-11-27 21:42:58 +11:00 · 2011-11-27 21:42:58 +11:00 · 39ac60fffe
commit 39ac60fffe
parent cecdfa4762 867878a4f4
2 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,6 +2,7 @@ script: "bundle exec rake travis"
 before_script: ./bin/ci/before_build.sh
 rvm:
  - 1.9.2
+  - 1.9.3
 notifications:
  email:
    - didier@nocoffee.fr
--- a/2
+++ b/2
@ -61,7 +61,7 @@ end
 group :test, :development do
  # gem 'linecache', '0.43', :platforms => :mri_18
  # gem 'ruby-debug', :platforms => :mri_18
-  # gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug'
+  # gem 'ruby-debug19', :platforms => :mri_19
  gem 'cucumber-rails'
 end