From 0d9311624754fbc3e0b8f4a28be576e48783bf81 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Mon, 12 Jun 2017 21:52:56 +0000
Subject: Merge branch 'winh-ignore-CVE-2017-5029' into 'master'

Ignore CVE-2017-5029 in Nokogiri

Closes #33597

See merge request !12109
---
 scripts/static-analysis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/static-analysis b/scripts/static-analysis
index 7dc8f679036..6d35684b97f 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -3,7 +3,7 @@
 require ::File.expand_path('../lib/gitlab/popen', __dir__)
 
 tasks = [
-  %w[bundle exec bundle-audit check --update --ignore CVE-2016-4658],
+  %w[bundle exec bundle-audit check --update --ignore CVE-2016-4658 CVE-2017-5029],
   %w[bundle exec rake config_lint],
   %w[bundle exec rake flay],
   %w[bundle exec rake haml_lint],
-- 
cgit v1.2.3