Skip to content

Commit

Permalink
Merge 10d3247 into 0e0925f
Browse files Browse the repository at this point in the history
  • Loading branch information
bwillis committed Mar 9, 2020
2 parents 0e0925f + 10d3247 commit dffe06c
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 441 deletions.
26 changes: 1 addition & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,17 @@
language: ruby

# https://github.com/travis-ci/travis-ci/issues/5239
before_install:
- gem install bundler

rvm:
- 1.9.2-p330
- 1.9.3
- 2.0.0
- 2.1.0
- 2.2.0
- 2.2.2
- 2.3.3
- ruby-head

gemfile:
- gemfiles/rails3.2.gemfile
- gemfiles/rails4.0.gemfile
- gemfiles/rails4.1.gemfile
- gemfiles/rails4.2.gemfile
- gemfiles/rails5.0.gemfile

matrix:
exclude:
- rvm: 1.9.2-p330
gemfile: gemfiles/rails4.0.gemfile
- rvm: 1.9.2-p330
gemfile: gemfiles/rails4.1.gemfile
- rvm: 1.9.2-p330
gemfile: gemfiles/rails4.2.gemfile
- rvm: 1.9.2-p330
gemfile: gemfiles/rails5.0.gemfile
- rvm: 1.9.3
gemfile: gemfiles/rails5.0.gemfile
- rvm: 2.0.0
gemfile: gemfiles/rails5.0.gemfile
- rvm: 2.1.0
gemfile: gemfiles/rails5.0.gemfile
- rvm: 2.2.0
gemfile: gemfiles/rails5.0.gemfile

Expand Down
24 changes: 0 additions & 24 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
appraise "rails3.2" do
gem('actionpack', '~> 3.2.0')
gem('activesupport', '~> 3.2.0')
gem('railties', '~> 3.2.0')
# Rails 3.2 has test-unit as a dependency, but Ruby 2.2 removes
# it, so we need to now manually require it as a dependency
gem('test-unit', '~>3.0')
end

appraise "rails4.0" do
gem('actionpack', '~> 4.0.0')
gem('activesupport', '~> 4.0.0')
gem('railties', '~> 4.0.0')
# Rails 4.0 has test-unit as a dependency, but Ruby 2.2 removes
# it, so we need to now manually require it as a dependency
gem('test-unit', '~>3.0')
end

appraise "rails4.1" do
gem('actionpack', '~> 4.1.0')
gem('activesupport', '~> 4.1.0')
gem('railties', '~> 4.1.0')
end

appraise "rails4.2" do
gem('actionpack', '~> 4.2.0')
gem('activesupport', '~> 4.2.0')
Expand Down
10 changes: 0 additions & 10 deletions gemfiles/rails3.2.gemfile

This file was deleted.

121 changes: 0 additions & 121 deletions gemfiles/rails3.2.gemfile.lock

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/rails4.0.gemfile

This file was deleted.

102 changes: 0 additions & 102 deletions gemfiles/rails4.0.gemfile.lock

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/rails4.1.gemfile

This file was deleted.

0 comments on commit dffe06c

Please sign in to comment.