From 3f15b72fa77b8ad6e35f03eabe7c96bcead8841d Mon Sep 17 00:00:00 2001
From: deppbot <deppbot@jollygoodcode.com>
Date: Mon, 27 Jun 2016 18:54:48 +0800
Subject: [PATCH] Security Update on 2016-06-27

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

diff --git a/Gemfile b/Gemfile
index 35eeadb42ca..8ca56c0aa3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'carrierwave', '0.9.0'
 gem 'validates_email_format_of'
 gem 'friendly_id', '5.0.4'
 gem 'babosa', '1.0.2'
-gem 'nokogiri', '~> 1.6.7.2'
+gem 'nokogiri', '>= 1.6.8'
 gem 'slimmer', '9.0.1'
 gem 'plek', '~> 1.12'
 gem 'isbn_validation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 93ba93ccd9c..640c32c2c88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,7 +227,7 @@ GEM
     mime-types (1.25.1)
     mini_magick (3.6.0)
       subexec (~> 0.2.1)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     minitest-fail-fast (0.0.1)
       minitest (~> 5)
@@ -241,8 +241,9 @@ GEM
     mysql2 (0.3.17)
     netrc (0.11.0)
     newrelic_rpm (3.9.9.275)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     null_logger (0.0.1)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -270,6 +271,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    pkg-config (1.1.7)
     plek (1.12.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
@@ -491,7 +493,7 @@ DEPENDENCIES
   mocha (= 1.1.0)
   mysql2
   newrelic_rpm
-  nokogiri (~> 1.6.7.2)
+  nokogiri (>= 1.6.8)
   parallel (= 1.4.1)
   parallel_tests
   pdf-reader (= 1.3.3)