Merge pull request #5 from campaignio/master

Re-add Active Model Serializers Dependency
This commit is contained in:
jrhe 2013-06-06 03:04:18 -07:00
commit 77e3b26251
2 changed files with 2 additions and 2 deletions

View file

@ -2,6 +2,7 @@ PATH
remote: . remote: .
specs: specs:
grape-active_model_serializers (0.1.0) grape-active_model_serializers (0.1.0)
active_model_serializers (~> 0.8.0)
grape (~> 0.3) grape (~> 0.3)
GEM GEM
@ -66,7 +67,6 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
active_model_serializers
activerecord activerecord
activerecord-nulldb-adapter activerecord-nulldb-adapter
grape-active_model_serializers! grape-active_model_serializers!

View file

@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
gem.version = Grape::ActiveModelSerializers::VERSION gem.version = Grape::ActiveModelSerializers::VERSION
gem.add_dependency "grape", "~> 0.3" gem.add_dependency "grape", "~> 0.3"
gem.add_dependency "active_model_serializers", ">= 0.8.1"
gem.add_development_dependency "activerecord" gem.add_development_dependency "activerecord"
gem.add_development_dependency "active_model_serializers"
gem.add_development_dependency "rspec", "~> 2.12.0" gem.add_development_dependency "rspec", "~> 2.12.0"
gem.add_development_dependency "rack-test" gem.add_development_dependency "rack-test"
gem.add_development_dependency "rake" gem.add_development_dependency "rake"