Skip to content

Commit

Permalink
Test against Rails 5
Browse files Browse the repository at this point in the history
Drop unmaintained versions of Ruby and Rails from the CI build matrix.
If you use those versions of Ruby and Rails, you can continue to use
previously released version of merit.

Upgrade Ambry dependency that works with Rails 5, with no XML
Serializer.
  • Loading branch information
tute committed Jul 22, 2016
1 parent 7957991 commit 1a76dde
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
13 changes: 2 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@ sudo: false
cache: bundler

rvm:
- 2.0
- 2.1
- 2.2
- 2.3.0

env:
- RAILS_VERSION=3.2
- RAILS_VERSION=4.1
- RAILS_VERSION=4.2

matrix:
exclude:
- env: RAILS_VERSION=3.2
rvm: 2.2
- RAILS_VERSION=5.0
2 changes: 1 addition & 1 deletion merit.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |s|

s.required_ruby_version = '>= 1.9.2'

s.add_dependency 'ambry', '~> 0.3.0'
s.add_dependency 'ambry', '~> 1.0.0'
s.add_development_dependency 'rails', '>= 3.2.0'
s.add_development_dependency 'capybara'
s.add_development_dependency 'simplecov'
Expand Down

0 comments on commit 1a76dde

Please sign in to comment.