Merge branch 'master' into patch-1

This commit is contained in:
Gonzalo Rodriguez 2019-01-31 11:27:37 -03:00
commit cdbd7a8193
No known key found for this signature in database
GPG key ID: 5DB8B81B049B8AB1
2 changed files with 6 additions and 6 deletions

View file

@ -4,14 +4,14 @@ cache: bundler
rvm: rvm:
- ruby-head - ruby-head
- 2.6.0 - 2.6.1
- 2.5.1 - 2.5.3
- 2.4.4 - 2.4.5
- 2.3.7 - 2.3.8
before_install: before_install:
- gem update --system - gem update --system
- gem install bundler - gem install bundler -v "~> 2.0"
gemfile: gemfile:
- gemfiles/rack_2_0.gemfile - gemfiles/rack_2_0.gemfile

View file

@ -33,7 +33,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'rack', ">= 1.0", "< 3" s.add_runtime_dependency 'rack', ">= 1.0", "< 3"
s.add_development_dependency 'appraisal', '~> 2.2' s.add_development_dependency 'appraisal', '~> 2.2'
s.add_development_dependency "bundler", "~> 1.16" s.add_development_dependency "bundler", ">= 1.17", "< 3.0"
s.add_development_dependency 'minitest', "~> 5.11" s.add_development_dependency 'minitest', "~> 5.11"
s.add_development_dependency "minitest-stub-const", "~> 0.6" s.add_development_dependency "minitest-stub-const", "~> 0.6"
s.add_development_dependency 'rack-test', "~> 1.0" s.add_development_dependency 'rack-test', "~> 1.0"