sjs/grape-active_model_serializers
1
0
Fork 0
mirror of https://github.com/samsonjs/grape-active_model_serializers.git synced 2026-04-27 14:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into read-options

Browse source
This commit is contained in:
Siong 2014-11-20 12:57:16 -08:00
commit 6426c772a8
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -1,7 +1,3 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gemspec gemspec
group :test do
gem 'jazz_hands', git: 'https://github.com/jrhe/jazz_hands.git', branch: 'without_rails'
end

1
grape-active_model_serializers.gemspec
View file

@ -22,6 +22,5 @@ Gem::Specification.new do |gem|
gem.add_development_dependency "rspec" gem.add_development_dependency "rspec"
gem.add_development_dependency "rack-test" gem.add_development_dependency "rack-test"
gem.add_development_dependency "rake" gem.add_development_dependency "rake"
gem.add_development_dependency "jazz_hands"
gem.add_development_dependency 'guard-rspec' gem.add_development_dependency 'guard-rspec'
end end

2
lib/.travis.yml
View file

@ -1,6 +1,8 @@
rvm: rvm:
- 1.9.2 - 1.9.2
- 1.9.3 - 1.9.3
- 2.0.0
- 2.1.2
- ruby-head - ruby-head
- rbx-19mode - rbx-19mode

2
spec/spec_helper.rb
View file

@ -11,8 +11,6 @@ require 'rspec'
require 'rack/test' require 'rack/test'
require 'grape-active_model_serializers' require 'grape-active_model_serializers'
require 'jazz_hands'
RSpec.configure do |config| RSpec.configure do |config|
config.include Rack::Test::Methods config.include Rack::Test::Methods
end end