From 1c440b513f26ed3e6785eacf6a14bb8dd485570c Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 10 Jan 2014 12:57:18 -0200 Subject: [PATCH] Depend on the released activerecord-jdbcsqlite3-adapter create_table_definition changed from 3 to 4 parameters was fixed and was included in 1.3.5 --- Gemfile | 1 - Gemfile.edge | 6 ++---- Gemfile.rails3 | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 6a4d9204..bc6d7817 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source 'https://rubygems.org' -# Specify gem dependencies in active_model_serializers.gemspec gemspec platforms :ruby do diff --git a/Gemfile.edge b/Gemfile.edge index 36c65d24..1e06dc48 100644 --- a/Gemfile.edge +++ b/Gemfile.edge @@ -12,7 +12,7 @@ platforms :mri do end platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter' + gem 'activerecord-jdbcsqlite3-adapter' end platforms :rbx do @@ -21,8 +21,6 @@ platforms :rbx do gem 'racc', '~> 1.4.10' end -# Use Rails master +# Use Rails master + current dependencies gem 'rails', github: 'rails/rails' - -# Current dependencies of edge rails gem 'arel', github: 'rails/arel' diff --git a/Gemfile.rails3 b/Gemfile.rails3 index 6484e975..d90af577 100644 --- a/Gemfile.rails3 +++ b/Gemfile.rails3 @@ -1,6 +1,5 @@ source 'https://rubygems.org' -# Specify gem dependencies in active_model_serializers.gemspec gemspec