Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ matrix:
- rvm: rbx-2

gemfile:
- Gemfile
- gemfiles/rails_3.gemfile
- gemfiles/rails_4.gemfile
- gemfiles/rails_3_2.gemfile
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5.gemfile
- gemfiles/rack_1.5.2.gemfile
14 changes: 11 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
appraise 'rails-3' do
appraise 'rails-3-2' do
gem 'rails', '3.2.19'
gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
end

appraise 'rails-4' do
gem 'rails', '4.1.6'
appraise 'rails-4-1' do
gem 'rails', '~> 4.1'
end

appraise 'rails-4-2' do
gem 'rails', '~> 4.2'
end

appraise 'rails-5' do
gem 'rails', '~> 5.x'
end

appraise 'rack-1.5.2' do
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
* [#1197](https://github.com/ruby-grape/grape/pull/1290): Fix using JSON and Array[JSON] as groups when parameter is optional - [@lukeivers](https://github.com/lukeivers).

0.14.0 (12/07/2015)
=================

#### Features

Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rack_1.5.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# This file was generated by Appraisal

source 'https://rubygems.org'
source "https://rubygems.org"

gem 'rack', '1.5.2'
gem "rack", "1.5.2"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this back to 1.8.x syntax?


group :development, :test do
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
end

gemspec path: '../'
gemspec :path => "../"
14 changes: 14 additions & 0 deletions gemfiles/rails_3_2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "3.2.19"
gem "rack-cache", "<= 1.2"

group :development, :test do
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
end

gemspec :path => "../"
13 changes: 13 additions & 0 deletions gemfiles/rails_4_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", " ~> 4.1"

group :development, :test do
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
end

gemspec :path => "../"
13 changes: 13 additions & 0 deletions gemfiles/rails_4_2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 4.2"

group :development, :test do
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
end

gemspec :path => "../"
13 changes: 13 additions & 0 deletions gemfiles/rails_5.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 5.x"

group :development, :test do
gem "guard"
gem "guard-rspec"
gem "guard-rubocop"
end

gemspec :path => "../"
1 change: 1 addition & 0 deletions grape.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ Gem::Specification.new do |s|
s.files = Dir['**/*'].keep_if { |file| File.file?(file) }
s.test_files = Dir['spec/**/*']
s.require_paths = ['lib']
s.required_ruby_version = '~> 2'
end