diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 14:40:55 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 14:40:55 +0100 |
| commit | 4f325ea97e85be66c96b5eb19a51012cdc34a905 (patch) | |
| tree | dc5d8403372209c719f2fe8ee95989cb2fcf2020 | |
| parent | a14639c31bbe33c23853a66d6feb817da4248e1a (diff) | |
| parent | ae5d868a13ac722e49f0c83080ee2e05ab8d9aa8 (diff) | |
| download | coderay-4f325ea97e85be66c96b5eb19a51012cdc34a905.tar.gz | |
Merge branch 'master' into ruby-2.3
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8e18c0a..f815698 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,10 @@ rvm: - 1.8.7 - ree - 1.9.3 - - 2.0.0 + - 2.0 - 2.1 - 2.2 + - 2.3.0 - ruby-head - jruby-18mode - jruby-19mode @@ -21,3 +22,4 @@ matrix: - rvm: rbx-18mode - rvm: rbx-19mode script: "rake test" # test:scanners" +sudo: false @@ -10,6 +10,7 @@ group :development do gem "rake" gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3" gem "term-ansicolor" + gem 'tins', '~> 1.6.0' gem "shoulda-context" gem "test-unit" gem "json" if RUBY_VERSION < '1.9' |