From 660493bdab77f931b42c73cdee5f6beb9eef6d92 Mon Sep 17 00:00:00 2001
From: pjsier <pjsier@gmail.com>
Date: Thu, 11 Jan 2018 08:52:11 -0600
Subject: [PATCH] Update nokogiri

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 50aa5413..f7721d1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ gem 'cocoon'
 gem 'polyamorous'
 gem 'ransack', '~> 1.2'
 gem 'activeadmin', "1.0.0.pre1"
-gem 'nokogiri'
+gem 'nokogiri', '~> 1.8'
 
 # Monitoring/Alerting
 gem 'sentry-raven', '~> 0.12.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3271aa84..a7ece587 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,15 +304,15 @@ GEM
     mime-types (2.99.3)
     mimemagic (0.3.0)
     mini_mime (1.0.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     multi_json (1.12.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.8.0)
     newrelic_rpm (3.9.5.251)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -591,7 +591,7 @@ DEPENDENCIES
   less-rails (~> 2.5)
   memcachier
   newrelic_rpm
-  nokogiri
+  nokogiri (~> 1.8)
   omniauth-openid-connect
   paper_trail (~> 3.0)
   paperclip (~> 4.2)