File tree Expand file tree Collapse file tree 7 files changed +16
-20
lines changed
lib/grape_entity/exposure Expand file tree Collapse file tree 7 files changed +16
-20
lines changed Original file line number Diff line number Diff line change 1+ --format documentation
12--color
2- --format = progress
Original file line number Diff line number Diff line change @@ -7,20 +7,19 @@ bundler_args: --without test
77
88matrix :
99 include :
10- - rvm : 2.3.1
10+ - rvm : 2.4.0
1111 script :
1212 - bundle exec danger
13- - rvm : 2.3.1
14- - rvm : 2.3.0
15- - rvm : 2.2
16- - rvm : 2.1
13+ - rvm : 2.4.0
14+ - rvm : 2.3.3
15+ - rvm : 2.2.6
1716 - rvm : ruby-head
18- - rvm : jruby-9.1.2 .0
17+ - rvm : jruby-9.1.6 .0
1918 - rvm : jruby-head
2019 - rvm : rbx-2
2120
2221 allow_failures :
2322 - rvm : ruby-head
24- - rvm : jruby-9.1.2 .0
23+ - rvm : jruby-9.1.6 .0
2524 - rvm : jruby-head
2625 - rvm : rbx-2
Original file line number Diff line number Diff line change 22
33#### Features
44
5+ * [ #253 ] ( https://github.com/ruby-grape/grape-entity/pull/253 ) : Adds ruby 2.4.0 support, updates dependencies - [ @LeFnord ] ( https://github.com/LeFnord ) .
56* Your contribution here.
67
78#### Fixes
Original file line number Diff line number Diff line change @@ -2,19 +2,14 @@ source 'http://rubygems.org'
22
33gemspec
44
5- if RUBY_VERSION < '2.2.2'
6- gem 'rack' , '<2.0.0'
7- gem 'activesupport' , '<5.0.0'
8- end
9-
105group :development , :test do
11- gem 'ruby-grape-danger' , '~> 0.1.0 ' , require : false
6+ gem 'ruby-grape-danger' , '~> 0.1.1 ' , require : false
127end
138
149group :test do
10+ gem 'growl'
1511 gem 'guard'
16- gem 'guard-rspec'
1712 gem 'guard-bundler'
13+ gem 'guard-rspec'
1814 gem 'rb-fsevent'
19- gem 'growl'
2015end
Original file line number Diff line number Diff line change @@ -17,4 +17,4 @@ RSpec::Core::RakeTask.new(:spec)
1717require 'rubocop/rake_task'
1818RuboCop ::RakeTask . new ( :rubocop )
1919
20- task default : [ :rubocop , :spec ]
20+ task default : [ :spec , :rubocop ]
Original file line number Diff line number Diff line change @@ -12,10 +12,12 @@ Gem::Specification.new do |s|
1212 s . description = 'Extracted from Grape, A Ruby framework for rapid API development with great conventions.'
1313 s . license = 'MIT'
1414
15+ s . required_ruby_version = '>= 2.2.6'
16+
1517 s . rubyforge_project = 'grape-entity'
1618
1719 s . add_runtime_dependency 'multi_json' , '>= 1.3.2'
18- s . add_runtime_dependency 'activesupport'
20+ s . add_runtime_dependency 'activesupport' , '>= 5.0.0'
1921
2022 s . add_development_dependency 'bundler'
2123 s . add_development_dependency 'rake'
Original file line number Diff line number Diff line change @@ -34,8 +34,7 @@ def ==(other)
3434 @conditions == other . conditions
3535 end
3636
37- def setup
38- end
37+ def setup ; end
3938
4039 def nesting?
4140 false
You can’t perform that action at this time.
0 commit comments