From 939d902b71b8fd1fae9084a68f6a2af898c7e16b Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sat, 23 Jan 2016 21:59:53 -0800
Subject: [PATCH] rebuild Gemfile.lock with updates, hopefully fix corruption
 issue

---
 Gemfile.lock | 78 ++++++++++++++++++----------------------------------
 1 file changed, 27 insertions(+), 51 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d389efcc..bd3d27de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,9 +16,9 @@ GEM
     bcrypt (3.1.10)
     blankslate (3.1.3)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    capybara (2.5.0)
+    byebug (8.2.1)
+    capybara (2.6.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -27,30 +27,13 @@ GEM
     capybara_minitest_spec (1.0.5)
       capybara (>= 2)
       minitest (>= 4)
-    celluloid (0.17.2)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.5)
-      timers (>= 4.1.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
-    columnize (0.9.0)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
     coveralls (0.8.10)
       json (~> 1.8)
@@ -59,7 +42,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
     dante (0.2.0)
@@ -67,14 +50,14 @@ GEM
       nokogiri (>= 1.4.2)
       rack (>= 1.1.0)
       uuidtools (~> 2.1.1)
-    dnsruby (1.58.0)
+    dnsruby (1.59.1)
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     drydock (0.6.9)
     erubis (2.7.0)
     fabrication (2.14.1)
-    faker (1.5.0)
+    faker (1.6.1)
       i18n (~> 0.5)
     ffi (1.9.10)
     ffi-compiler (0.1.3)
@@ -82,10 +65,9 @@ GEM
       rake
     filesize (0.1.1)
     geoip (1.6.1)
-    hashdiff (0.2.2)
+    hashdiff (0.2.3)
     highline (1.7.8)
-    hiredis (0.6.0)
-    hitimes (1.2.3)
+    hiredis (0.6.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -96,7 +78,7 @@ GEM
       rack (~> 1.4)
       rest-client (~> 1.0)
     json (1.8.3)
-    m (1.4.0)
+    m (1.4.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     magic (0.2.9)
@@ -108,7 +90,7 @@ GEM
     mime-types (2.99)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    minitest-reporters (1.1.3)
+    minitest-reporters (1.1.7)
       ansi
       builder
       minitest (>= 5.0)
@@ -118,15 +100,15 @@ GEM
     multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
+    net-ssh (3.0.2)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.4.7)
       nokogiri
     paypal-recurring (1.1.0)
-    pg (0.18.3)
-    poltergeist (1.7.0)
+    pg (0.18.4)
+    poltergeist (1.8.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -136,12 +118,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
-    puma (2.14.0)
+    puma (2.15.3)
     rack (1.6.4)
-    rack-cache (1.5.0)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
@@ -152,10 +134,8 @@ GEM
     rack_session_access (0.1.1)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rake (10.4.2)
-    redis (3.2.1)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
+    rake (10.5.0)
+    redis (3.2.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -174,22 +154,20 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.19)
+    sass (3.4.21)
     scrypt (2.0.2)
       ffi-compiler (>= 0.0.2)
       rake
     sequel (4.8.0)
-    sequel_pg (1.6.13)
+    sequel_pg (1.6.14)
       pg (>= 0.8.0)
       sequel (>= 3.39.0)
     shotgun (0.9.1)
       rack (>= 1.0)
-    sidekiq (3.5.1)
-      celluloid (~> 0.17.2)
+    sidekiq (4.0.2)
+      concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
-      json (~> 1.0)
       redis (~> 3.2, >= 3.2.1)
-      redis-namespace (~> 1.5, >= 1.5.2)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -221,10 +199,8 @@ GEM
     thor (0.19.1)
     thread (0.2.2)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     timecop (0.8.0)
-    timers (4.1.1)
-      hitimes
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -232,11 +208,11 @@ GEM
       unf_ext
     unf_ext (0.0.7.1)
     uuidtools (2.1.5)
-    webmock (1.22.1)
+    webmock (1.22.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.1.0)