Merge pull request #628 from fatfreecrm/security-update-2017-11-29-16…

…0913 Security Update on 2017-11-29
fatfreecrm · Nov 30, 2017 · b4ad85c · b4ad85c
2 parents 8b10552 + 2cf978a
commit b4ad85c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -84,5 +84,5 @@ gem 'coffee-rails'
 gem 'uglifier'
 gem 'execjs'
 gem 'therubyracer', platform: :ruby unless ENV["CI"]
-gem 'nokogiri', '>= 1.6.8'
+gem 'nokogiri', '>= 1.8.1'
 gem 'activemodel-serializers-xml'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_mime (0.1.4)
-    mini_portile2 (2.2.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.2)
     money (6.9.0)
       i18n (>= 0.6.4, < 0.9)
@@ -197,8 +197,8 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
     nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -435,7 +435,7 @@ DEPENDENCIES
   jquery-migrate-rails
   jquery-rails
   jquery-ui-rails
-  nokogiri (>= 1.6.8)
+  nokogiri (>= 1.8.1)
   paper_trail (~> 6.0.0)
   paperclip
   pg