Merge branch 'master' into ruby-2.3

korny · korny · commit 4f325ea97e85 · 2016-02-13T14:40:55.000+01:00
diff --git 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
diff --git a/Gemfile b/Gemfile
@@ -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'
