Skip to content

Commit

Permalink
Add ruby 2.5 support, drop 2.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
darren987469 authored and basjanssen committed Feb 28, 2020
1 parent 20d1849 commit 551cf6c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
34 changes: 17 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,37 @@ sudo: false

matrix:
include:
- rvm: 2.4.5
- rvm: 2.5.3
script:
- bundle exec danger
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: Gemfile
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/rack_edge.gemfile
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/rails_edge.gemfile
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/multi_json.gemfile
script:
- bundle exec rake
- bundle exec rspec spec/integration/multi_json
- rvm: 2.4.5
- rvm: 2.5.3
gemfile: gemfiles/multi_xml.gemfile
script:
- bundle exec rake
- bundle exec rspec spec/integration/multi_xml
- rvm: 2.4.5
gemfile: Gemfile
- rvm: 2.4.5
gemfile: gemfiles/rack_edge.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.3.8
gemfile: Gemfile
- rvm: 2.3.8
Expand All @@ -36,19 +44,11 @@ matrix:
- rvm: 2.3.8
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.2.10
gemfile: Gemfile
- rvm: 2.2.10
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.2.10
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.2.10
gemfile: gemfiles/rails_4.gemfile
- rvm: 2.2.10
gemfile: gemfiles/rails_3.gemfile
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-3
allow_failures:
- rvm: 2.2.10
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-3
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#### Features

* Your contribution here.
* [#1795](https://github.com/ruby-grape/grape/pull/1803): Adds the ability to re-mount all endpoints in any location - [@myxoh](https://github.com/bschmeck).
* [#1813](https://github.com/ruby-grape/grape/pull/1813): Add ruby 2.5 support, drop 2.2. Update rails version in travis - [@darren987469](https://github.com/darren987469).
* [#1803](https://github.com/ruby-grape/grape/pull/1803): Adds the ability to re-mount all endpoints in any location - [@myxoh](https://github.com/bschmeck).
* [#1795](https://github.com/ruby-grape/grape/pull/1795): Fix vendor/subtype parsing of an invalid Accept header - [@bschmeck](https://github.com/bschmeck).
* [#1791](https://github.com/ruby-grape/grape/pull/1791): Support `summary`, `hidden`, `deprecated`, `is_array`, `nickname`, `produces`, `consumes`, `tags` options in `desc` block - [@darren987469](https://github.com/darren987469).

Expand Down

0 comments on commit 551cf6c

Please sign in to comment.