From 99fa399ae6dc071b97b15e1ef2b42f0d23c492ec Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 27 Dec 2013 12:17:36 -0200 Subject: [PATCH] Depend on activerecord-jdbc-adapter for jruby edge tests When this https://github.com/jruby/activerecord-jdbc-adapter/commit/358505dbdd8c3cb17eb4ac286b4e02fed6fcc72c commit is released we can depend again on the released gem --- .travis.yml | 2 -- Gemfile.edge | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a91665b7..65a0293f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ gemfile: - Gemfile.rails3 - Gemfile.edge matrix: - allow_failures: - - rvm: jruby fast_finish: true notifications: email: false diff --git a/Gemfile.edge b/Gemfile.edge index ae73399c..e112557c 100644 --- a/Gemfile.edge +++ b/Gemfile.edge @@ -12,7 +12,7 @@ platforms :mri do end platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter' + gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter' end platforms :rbx do