From 7b9b5829dcb4fb075ed2ceb1bfa42e46b376fc35 Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com>
Date: Mon, 15 Jan 2018 15:03:12 -0800
Subject: [PATCH] Fix bundle errors on macs

---
 Gemfile      |  2 +-
 Gemfile.lock | 42 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index e40ffa4..04c032f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'workflow', '1.0.0'
 gem 'workflow_on_mongoid'
 gem 'git'
 gem 'activemerchant'
-gem 'nokogiri'
+gem 'nokogiri', '1.6.7'
 gem 'sanitize', '2.1.0'
 gem 'redis'
 gem 'github_api'
diff --git a/Gemfile.lock b/Gemfile.lock
index c0de7ea..b8ec8c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,6 +101,10 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     bcrypt (3.1.9)
     bcrypt (3.1.9-x64-mingw32)
     better_errors (2.0.0)
@@ -120,6 +124,8 @@ GEM
     cloudflare (2.0.2)
       json (~> 1)
     coderay (1.1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -148,6 +154,13 @@ GEM
       json (>= 1.5.1)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
+    droplet_kit (2.2.2)
+      activesupport (> 3.0, < 6)
+      faraday (~> 0.9)
+      kartograph (~> 0.2.3)
+      resource_kit (~> 0.1.5)
+      virtus (~> 1.0.3)
+    equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.6.0)
     extlib (0.9.16)
@@ -194,6 +207,7 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
+    ice_nine (0.11.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -202,10 +216,13 @@ GEM
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    kartograph (0.2.7)
     kgio (2.9.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.5)
+    libv8 (3.16.14.15)
+    lockup (1.4)
+      rails (>= 3, < 6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
@@ -214,7 +231,7 @@ GEM
       mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
     mime-types (2.6.2)
-    mini_portile (0.6.1)
+    mini_portile2 (2.0.0)
     minitest (5.8.2)
     minitest-reporters (1.1.5)
       ansi
@@ -239,10 +256,10 @@ GEM
     net-http-pipeline (1.0.1)
     netaddr (1.5.0)
     netrc (0.11.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.5-x64-mingw32)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7-x64-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -312,6 +329,8 @@ GEM
     redcarpet (3.2.2)
     redis (3.2.0)
     ref (1.0.5)
+    resource_kit (0.1.7)
+      addressable (>= 2.3.6, < 3.0.0)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
@@ -392,6 +411,11 @@ GEM
     uuid (2.3.7)
       macaddr (~> 1.0)
     uuidtools (2.1.5)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.3)
       rack (>= 1.0)
     workflow (1.0.0)
@@ -419,6 +443,7 @@ DEPENDENCIES
   dante
   devise
   dogapi
+  droplet_kit
   eventmachine!
   factory_girl_rails (~> 4.0)
   gemoji
@@ -432,13 +457,14 @@ DEPENDENCIES
   json
   jwt
   kaminari
+  lockup
   minitest
   minitest-reporters (>= 0.5.0)
   mocha
   mongoid (~> 5.0.0)
   net-http-pipeline
   netaddr (~> 1.5.0)
-  nokogiri
+  nokogiri (= 1.6.7)
   peek
   peek-git
   peek-performance_bar
@@ -475,4 +501,4 @@ DEPENDENCIES
   workflow_on_mongoid
 
 BUNDLED WITH
-   1.14.6
+   1.16.1
\ No newline at end of file