Skip to content

Commit 9c942f4

Browse files
committed
Add ruby 2.5 support, drop 2.2.
1 parent ab07066 commit 9c942f4

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.travis.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,37 @@ sudo: false
44

55
matrix:
66
include:
7-
- rvm: 2.4.5
7+
- rvm: 2.5.3
88
script:
99
- bundle exec danger
10-
- rvm: 2.4.5
10+
- rvm: 2.5.3
1111
gemfile: Gemfile
12-
- rvm: 2.4.5
12+
- rvm: 2.5.3
1313
gemfile: gemfiles/rack_edge.gemfile
14-
- rvm: 2.4.5
14+
- rvm: 2.5.3
1515
gemfile: gemfiles/rack_1.5.2.gemfile
16-
- rvm: 2.4.5
16+
- rvm: 2.5.3
1717
gemfile: gemfiles/rails_edge.gemfile
18-
- rvm: 2.4.5
18+
- rvm: 2.5.3
1919
gemfile: gemfiles/rails_5.gemfile
20-
- rvm: 2.4.5
20+
- rvm: 2.5.3
2121
gemfile: gemfiles/multi_json.gemfile
2222
script:
2323
- bundle exec rake
2424
- bundle exec rspec spec/integration/multi_json
25-
- rvm: 2.4.5
25+
- rvm: 2.5.3
2626
gemfile: gemfiles/multi_xml.gemfile
2727
script:
2828
- bundle exec rake
2929
- bundle exec rspec spec/integration/multi_xml
30+
- rvm: 2.4.5
31+
gemfile: Gemfile
32+
- rvm: 2.4.5
33+
gemfile: gemfiles/rack_edge.gemfile
34+
- rvm: 2.4.5
35+
gemfile: gemfiles/rack_1.5.2.gemfile
36+
- rvm: 2.4.5
37+
gemfile: gemfiles/rails_5.gemfile
3038
- rvm: 2.3.8
3139
gemfile: Gemfile
3240
- rvm: 2.3.8
@@ -36,19 +44,11 @@ matrix:
3644
- rvm: 2.3.8
3745
gemfile: gemfiles/rails_5.gemfile
3846
- rvm: 2.2.10
39-
gemfile: Gemfile
40-
- rvm: 2.2.10
41-
gemfile: gemfiles/rack_1.5.2.gemfile
42-
- rvm: 2.2.10
43-
gemfile: gemfiles/rails_5.gemfile
44-
- rvm: 2.2.10
45-
gemfile: gemfiles/rails_4.gemfile
46-
- rvm: 2.2.10
47-
gemfile: gemfiles/rails_3.gemfile
4847
- rvm: ruby-head
4948
- rvm: jruby-head
5049
- rvm: rbx-3
5150
allow_failures:
51+
- rvm: 2.2.10
5252
- rvm: ruby-head
5353
- rvm: jruby-head
5454
- rvm: rbx-3

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#### Features
44

55
* Your contribution here.
6-
* [#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).
6+
* [#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).
7+
* [#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).
78
* [#1795](https://github.com/ruby-grape/grape/pull/1795): Fix vendor/subtype parsing of an invalid Accept header - [@bschmeck](https://github.com/bschmeck).
89
* [#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).
910

0 commit comments

Comments
 (0)