Skip to content

Commit dedbf0b

Browse files
authored
Adds ruby 3.0.0 to travis. (#342)
- removes 2.4.10 tests - move 2.5.8 to allowed failures -> not official supported anymore - adds changelog entry
1 parent bda9756 commit dedbf0b

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@ after_success:
77
- bundle exec danger
88

99
rvm:
10-
- 2.5.8
1110
- 2.6.6
1211
- 2.7.2
13-
- ruby-head
14-
- jruby-head
15-
- truffleruby-head
16-
- 2.4.10
17-
12+
- 3.0.0
1813

1914
matrix:
2015
fast_finish: true
2116

17+
include:
18+
- rvm: 2.5.8
19+
- rvm: ruby-head
20+
- rvm: jruby-head
21+
- rvm: truffleruby-head
22+
2223
allow_failures:
23-
- rvm: 2.4.10
24+
- rvm: 2.5.8
2425
- rvm: ruby-head
2526
- rvm: jruby-head
2627
- rvm: truffleruby-head

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+
* [#342](https://github.com/ruby-grape/grape-entity/pull/342): Adds ruby 3.0.0 to travis - [@LeFnord](https://github.com/LeFnord).
67

78
#### Fixes
89

lib/grape_entity/entity.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ def hash_access=(value)
122122
case value
123123
when :to_s, :str, :string
124124
:to_s
125-
when :to_sym, :sym, :symbol
126-
:to_sym
127125
else
128126
:to_sym
129127
end

lib/grape_entity/exposure/nesting_exposure/output_builder.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def output
5151
output
5252
end
5353

54-
# rubocop:disable Lint/EmptyBlock
5554
# In case if we want to solve collisions providing lambda to :merge option
5655
def merge_strategy(for_merge)
5756
if for_merge.respond_to? :call
@@ -60,7 +59,6 @@ def merge_strategy(for_merge)
6059
-> {}
6160
end
6261
end
63-
# rubocop:enable Lint/EmptyBlock
6462
end
6563
end
6664
end

0 commit comments

Comments
 (0)