Merge branch 'security-update-nokogiri-cve-2020-7595' into 'master'

Update Nokogiri to fix CVE-2020-7595 Closes #73 See merge request gitlab-org/security/gitlab!271

Merge branch 'security-update-nokogiri-cve-2020-7595' into 'master'
Update Nokogiri to fix CVE-2020-7595 Closes #73 See merge request gitlab-org/security/gitlab!271
04d3c979 · GitLab Release Tools Bot · cda2d0e0 · 75f230d4 · 04d3c979 · 04d3c979
Commit 04d3c979 authored Mar 25, 2020 by GitLab Release Tools Bot
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/security-update-nokogiri-cve-2020-7595.yml ...ogs/unreleased/security-update-nokogiri-cve-2020-7595.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -652,7 +652,7 @@ GEM
    netrc (0.11.0)
    nio4r (2.5.2)
    no_proxy_fix (0.1.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
      mini_portile2 (~> 2.4.0)
    nokogumbo (1.5.0)
      nokogiri

--- a/changelogs/unreleased/security-update-nokogiri-cve-2020-7595.yml
+++ b/changelogs/unreleased/security-update-nokogiri-cve-2020-7595.yml
+---
+title: Update Nokogiri to fix CVE-2020-7595
+merge_request:
+author:
+type: security