Merge branch 'winh-ignore-CVE-2017-5029' into 'master'

Ignore CVE-2017-5029 in Nokogiri

Closes #33597

See merge request !12109
This commit is contained in:
Robert Speicher 2017-06-12 21:52:56 +00:00
commit de20057ccb

View file

@ -3,7 +3,7 @@
require ::File.expand_path('../lib/gitlab/popen', __dir__) require ::File.expand_path('../lib/gitlab/popen', __dir__)
tasks = [ 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 config_lint],
%w[bundle exec rake flay], %w[bundle exec rake flay],
%w[bundle exec rake haml_lint], %w[bundle exec rake haml_lint],