Merge pull request #2141 from joshk/master

Config files to get Rails on Travis-CI

1 files changed, 3 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index e1a8b5637e..a9541b4d1f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,13 +31,13 @@ gem "memcache-client", ">= 1.8.5"
 
 platforms :mri_18 do
   gem "system_timer"
-  gem "ruby-debug", ">= 0.10.3"
+  gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
   gem "json"
 end
 
 platforms :mri_19 do
   # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => "ruby-debug" if RUBY_VERSION < "1.9.3"
+  gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
 end
 
 platforms :ruby do
@@ -56,7 +56,7 @@ platforms :ruby do
   gem "sqlite3", "~> 1.3.3"
 
   group :db do
-    gem "pg", ">= 0.11.0"
+    gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
     gem "mysql", ">= 2.8.1"
     gem "mysql2", ">= 0.3.6"
   end