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