diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-12 21:52:56 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-12 21:52:56 +0000 |
| commit | de20057ccbd3b8c94d64ff5d8deb14cab232d08a (patch) | |
| tree | 6b623f237490f8de88ba3d8498c2f9267bc15d94 | |
| parent | 652eb0118b3cf87f96dfbaacf5802d974303e427 (diff) | |
| parent | 3268b84f89a85e3dd1c64611e6c989076e0dc768 (diff) | |
| download | gitlab-ce-de20057ccbd3b8c94d64ff5d8deb14cab232d08a.tar.gz | |
Merge branch 'winh-ignore-CVE-2017-5029' into 'master'
Ignore CVE-2017-5029 in Nokogiri
Closes #33597
See merge request !12109
| -rwxr-xr-x | scripts/static-analysis | 2 |
1 files changed, 1 insertions, 1 deletions
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], |