From 61944f5c5adf9d72dd1da7d13efd5b249f0ee1ca Mon Sep 17 00:00:00 2001
From: deppbot <deppbot@jollygoodcode.com>
Date: Thu, 23 Jun 2016 22:11:18 +0800
Subject: [PATCH] Security Update on 2016-06-23

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

diff --git a/Gemfile b/Gemfile
index 0b672e36cb..d0155e3da7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,3 +79,4 @@ gem 'coffee-rails'
 gem 'uglifier'
 gem 'execjs'
 gem 'therubyracer', platform: :ruby unless ENV["CI"]
+gem 'nokogiri', '>= 1.6.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c27be196d..04748e2988 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,15 +165,16 @@ GEM
     method_source (0.8.2)
     mime-types (2.99.1)
     mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     multi_json (1.11.2)
     nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.1)
-    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)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -188,6 +189,7 @@ GEM
       mime-types
       mimemagic (= 0.3.0)
     pg (0.18.4)
+    pkg-config (1.1.7)
     polyamorous (1.3.0)
       activerecord (>= 3.0)
     premailer (1.8.6)
@@ -386,7 +388,7 @@ DEPENDENCIES
   jquery-migrate-rails
   jquery-rails
   jquery-ui-rails
-  nokogiri
+  nokogiri (>= 1.6.8)
   paper_trail (>= 4.0.0.beta2)
   paperclip
   pg