Merge pull request #492 from fatfreecrm/security-update-2016-06-23-22…

…1115 Security Update on 2016-06-23
fatfreecrm · Aug 30, 2016 · 9fefb41 · 9fefb41
2 parents dc610a1 + 61944f5
commit 9fefb41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -85,3 +85,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
@@ -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