Merge branch 'winh-upgrade-nokogiri' into 'master'

Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427

Merge branch 'winh-upgrade-nokogiri' into 'master'
7d4ad67b · Robert Speicher · Jose Ivan Vargas · bc8a5795 · 7d4ad67b · 7d4ad67b
Commit 7d4ad67b authored Sep 21, 2017 by Robert Speicher Committed by Jose Ivan Vargas Sep 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +5 -4

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.0'
+gem 'nokogiri', '~> 1.8.1'

 # Diffs
 gem 'diffy', '~> 3.1.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -483,7 +483,8 @@ GEM
    method_source (0.8.2)
    mime-types (2.99.3)
    mimemagic (0.3.0)
-    mini_portile2 (2.2.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
    minitest (5.7.0)
    mmap2 (2.2.7)
    mousetrap-rails (1.4.6)
@@ -497,8 +498,8 @@ GEM
    net-ldap (0.16.0)
    net-ssh (4.1.0)
    netrc (0.11.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
    numerizer (0.1.1)
    oauth (0.5.1)
    oauth2 (1.4.0)
@@ -1066,7 +1067,7 @@ DEPENDENCIES
  mysql2 (~> 0.4.5)
  net-ldap
  net-ssh (~> 4.1.0)
-  nokogiri (~> 1.8.0)
+  nokogiri (~> 1.8.1)
  oauth2 (~> 1.4)
  octokit (~> 4.6.2)
  oj (~> 2.17.4)