Skip to content

Commit e0dfb9c

Browse files
authored
Add rails-6 (#2039)
1 parent b01c898 commit e0dfb9c

File tree

5 files changed

+51
-2
lines changed

5 files changed

+51
-2
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ matrix:
2323
gemfile: gemfiles/rails_edge.gemfile
2424
- rvm: 2.7.1
2525
gemfile: gemfiles/rails_5.gemfile
26+
- rvm: 2.7.1
27+
gemfile: gemfiles/rails_6.gemfile
2628
- rvm: 2.7.1
2729
gemfile: gemfiles/multi_json.gemfile
2830
script:
@@ -37,10 +39,14 @@ matrix:
3739
gemfile: Gemfile
3840
- rvm: 2.6.6
3941
gemfile: gemfiles/rails_5.gemfile
42+
- rvm: 2.6.6
43+
gemfile: gemfiles/rails_6.gemfile
4044
- rvm: 2.5.8
4145
gemfile: Gemfile
4246
- rvm: 2.5.8
4347
gemfile: gemfiles/rails_5.gemfile
48+
- rvm: 2.5.8
49+
gemfile: gemfiles/rails_6.gemfile
4450
- rvm: 2.4.10
4551
gemfile: Gemfile
4652
- rvm: 2.4.10

Appraisals

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# frozen_string_literal: true
22

33
appraise 'rails-5' do
4-
gem 'rails', '5.2.1'
4+
gem 'rails', '~> 5.2'
5+
end
6+
7+
appraise 'rails-6' do
8+
gem 'rails', '~> 6.0'
59
end
610

711
appraise 'rails-edge' do

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#### Features
44

55
* Your contribution here.
6+
* [#2039](https://github.com/ruby-grape/grape/pull/2039): Travis - update rails versions - [@ericproulx](https://github.com/ericproulx).
67
* [#2038](https://github.com/ruby-grape/grape/pull/2038): Travis - update ruby versions - [@ericproulx](https://github.com/ericproulx).
78

89
#### Fixes

gemfiles/rails_5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
source 'https://rubygems.org'
66

7-
gem 'rails', '5.2.1'
7+
gem 'rails', '~> 5.2'
88

99
group :development, :test do
1010
gem 'bundler'

gemfiles/rails_6.gemfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# frozen_string_literal: true
2+
3+
# This file was generated by Appraisal
4+
5+
source 'https://rubygems.org'
6+
7+
gem 'rails', '~> 6.0'
8+
9+
group :development, :test do
10+
gem 'bundler'
11+
gem 'hashie'
12+
gem 'rake'
13+
gem 'rubocop', '0.80.1'
14+
gem 'rubocop-performance', require: false
15+
end
16+
17+
group :development do
18+
gem 'appraisal'
19+
gem 'benchmark-ips'
20+
gem 'guard'
21+
gem 'guard-rspec'
22+
gem 'guard-rubocop'
23+
end
24+
25+
group :test do
26+
gem 'cookiejar'
27+
gem 'coveralls_reborn'
28+
gem 'danger-toc', '~> 0.1.2'
29+
gem 'grape-entity', '~> 0.6'
30+
gem 'maruku'
31+
gem 'mime-types'
32+
gem 'rack-jsonp', require: 'rack/jsonp'
33+
gem 'rack-test', '~> 1.1.0'
34+
gem 'rspec', '~> 3.0'
35+
gem 'ruby-grape-danger', '~> 0.1.0', require: false
36+
end
37+
38+
gemspec path: '../'

0 commit comments

Comments
 (0)