From d61f9887338991ff6b85ab6b70a82154f314796d Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Fri, 29 Apr 2016 14:16:49 +0000 Subject: [PATCH 1/2] Update Gemfile.lock --- Gemfile.lock | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index efe458c2e..e42f1e7f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,27 +25,30 @@ GEM do_sqlite3 (~> 0.10.6) do_sqlite3 (0.10.17) data_objects (= 0.10.17) - em-websocket (0.3.8) - addressable (>= 2.1.1) + em-websocket (0.5.1) eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.6.0) fastercsv (1.5.5) geoip (1.6.1) + http_parser.rb (0.6.0) json (1.8.3) json_pure (1.8.3) librex (0.0.999) libv8 (3.11.8.17) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mojo_magick (0.5.6) msfrpc-client (1.0.3) librex (~> 0.0.70, >= 0.0.70) msgpack (~> 0.5.8, >= 0.5.8) msgpack (0.5.12) - multi_json (1.11.2) + multi_json (1.11.3) parseconfig (1.0.8) - qr4r (0.4.0) + qr4r (0.4.1) mojo_magick rqrcode rack (1.6.4) @@ -57,7 +60,7 @@ GEM rainbow rqrcode (0.10.1) chunky_png (~> 1.0) - rubydns (0.7.0) + rubydns (0.7.3) eventmachine (~> 1.0.0) rexec (~> 1.6.2) rubyzip (1.2.0) @@ -75,7 +78,7 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) tilt (2.0.2) - tins (1.9.0) + tins (1.10.1) uglifier (3.0.0) execjs (>= 0.3.0, < 3) @@ -100,7 +103,7 @@ DEPENDENCIES parseconfig qr4r rack - rubydns (= 0.7.0) + rubydns (~> 0.7.3) rubyzip (>= 1.0.0) sinatra term-ansicolor From 3a287ba8080dab3bd0e16468491a28458159da3b Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Fri, 29 Apr 2016 14:17:11 +0000 Subject: [PATCH 2/2] Add RVM 2.3.0 to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 61ce935a6..d1145b016 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,4 @@ rvm: - 2.0 - 2.1 - 2.2 + - 2.3.0