summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-24 17:36:05 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-24 17:36:05 +0000
commitcef1d6d2cb0dd64e19ecf7f6621dcf1d595b8930 (patch)
tree4beaf3b61955f174c72656e35200f077e18fa58f
parentec6f091e271806a4b87f227737d3cd151970ccb0 (diff)
parent1e43753b438b8b4bc70f300faab961cf920ce310 (diff)
downloadgitlab-ce-cef1d6d2cb0dd64e19ecf7f6621dcf1d595b8930.tar.gz
Merge branch 'rs-ignore-nokogiri-advisory' into 'master'
Temporarily ignore Nokogiri CVE-2016-4658 See merge request !10218
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2da8207a3cf..f271ab4c4c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -312,7 +312,7 @@ bundler:audit:
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
script:
- - "bundle exec bundle-audit check --update"
+ - "bundle exec bundle-audit check --update --ignore CVE-2016-4658"
migration paths:
stage: test