Merge pull request #235 from jasnow/master

Upgraded to Ruby 2.3.1 plus lots of gems

.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.3.0"
+  - "2.3.1"
 before_script: rake db:setup
 before_script: bundle exec rake db:setup
 cache: bundler

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 #don't upgrade
 gem 'rails', '4.2.6'
 
-ruby '2.3.0'
+ruby '2.3.1'
 
 gem 'rake', '10.5.0' # LOCKED DOWN UNTIL MOVE TO RSPEC beta2.
 

Gemfile.lock

@@ -52,21 +52,12 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.2.1)
+    brakeman (3.3.0)
-      erubis (~> 2.6)
-      haml (>= 3.0, < 5.0)
-      highline (>= 1.6.20, < 2.0)
-      ruby2ruby (~> 2.3.0)
-      ruby_parser (~> 3.8.1)
-      safe_yaml (>= 1.0)
-      sass (~> 3.0)
-      slim (>= 1.3.6, < 4.0)
-      terminal-table (~> 1.4)
     builder (3.2.2)
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    capybara (2.7.0)
+    capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -84,8 +75,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
-    contracts (0.13.0)
+    contracts (0.14.0)
     crack (0.3.1)
     cucumber (2.3.3)
       builder (>= 2.1.2)
@@ -108,9 +99,9 @@ GEM
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.9.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
     ffi (1.9.10)
-    foreman (0.80.2)
+    foreman (0.82.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
     gauntlt (0.1.4)
@@ -121,9 +112,9 @@ GEM
     gherkin (3.2.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    guard (2.13.0)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -139,16 +130,13 @@ GEM
       guard (~> 2.8)
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    guard-rspec (4.6.5)
+    guard-rspec (4.7.0)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     guard-shell (0.7.1)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
-    haml (4.0.7)
-      tilt
-    highline (1.7.8)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     jquery-fileupload-rails (0.4.6)
@@ -163,10 +151,11 @@ GEM
     kgio (2.10.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.13)
+    libv8 (3.16.14.15)
-    listen (3.1.1)
+    listen (3.1.5)
-      rb-fsevent (>= 0.9.3)
+      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (>= 0.9.7)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
@@ -184,16 +173,16 @@ GEM
     method_source (0.8.2)
     mime-types (3.0)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
-    multi_json (1.11.3)
+    multi_json (1.12.1)
     multi_test (0.1.2)
     mysql2 (0.4.4)
     nenv (0.3.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.0.8)
+    notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
     poltergeist (1.9.0)
@@ -203,7 +192,7 @@ GEM
       websocket-driver (>= 0.2.0)
     powder (0.3.0)
       thor (>= 0.11.5)
-    power_assert (0.2.7)
+    power_assert (0.3.0)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -247,7 +236,7 @@ GEM
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     ref (2.0.0)
-    responders (2.1.2)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -270,12 +259,7 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby2ruby (2.3.0)
+    ruby_dep (1.3.1)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.8.1)
-      sexp_processor (~> 4.1)
-    safe_yaml (1.0.4)
     sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -283,7 +267,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.7.0)
     shellany (0.0.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -297,9 +280,6 @@ GEM
     skinny (0.2.4)
       eventmachine (~> 1.0.0)
       thin (>= 1.5, < 1.7)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -309,9 +289,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    temple (0.7.6)
+    test-unit (3.1.9)
-    terminal-table (1.5.2)
-    test-unit (3.1.8)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -322,7 +300,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.4)
     travis-lint (2.0.0)
       json
     trollop (2.1.2)
@@ -335,7 +313,7 @@ GEM
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    websocket-driver (0.6.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -387,5 +365,8 @@ DEPENDENCIES
   uglifier
   unicorn
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
-   1.11.2
+   1.12.3