mirror of
https://github.com/samsonjs/grape-active_model_serializers.git
synced 2026-03-25 08:45:55 +00:00
Merge branch 'master' into read-options
This commit is contained in:
commit
6426c772a8
4 changed files with 3 additions and 8 deletions
4
Gemfile
4
Gemfile
|
|
@ -1,7 +1,3 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gemspec
|
||||
|
||||
group :test do
|
||||
gem 'jazz_hands', git: 'https://github.com/jrhe/jazz_hands.git', branch: 'without_rails'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -22,6 +22,5 @@ Gem::Specification.new do |gem|
|
|||
gem.add_development_dependency "rspec"
|
||||
gem.add_development_dependency "rack-test"
|
||||
gem.add_development_dependency "rake"
|
||||
gem.add_development_dependency "jazz_hands"
|
||||
gem.add_development_dependency 'guard-rspec'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
rvm:
|
||||
- 1.9.2
|
||||
- 1.9.3
|
||||
- 2.0.0
|
||||
- 2.1.2
|
||||
- ruby-head
|
||||
- rbx-19mode
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ require 'rspec'
|
|||
require 'rack/test'
|
||||
require 'grape-active_model_serializers'
|
||||
|
||||
require 'jazz_hands'
|
||||
|
||||
RSpec.configure do |config|
|
||||
config.include Rack::Test::Methods
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue