Commit ecdf7c26 authored by Robert Speicher's avatar Robert Speicher

Merge branch '31824-move-bundler-audit-job-to-static-analysis-job' into 'master'

Include the bundler:audit job into the static-analysis job

Closes #31824

See merge request !11092
parents 17dca783 221dccab
...@@ -412,18 +412,6 @@ rake karma: ...@@ -412,18 +412,6 @@ rake karma:
paths: paths:
- coverage-javascript/ - coverage-javascript/
bundler:audit:
stage: test
<<: *ruby-static-analysis
<<: *dedicated-runner
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
script:
- "bundle exec bundle-audit check --update --ignore CVE-2016-4658"
.migration-paths: &migration-paths .migration-paths: &migration-paths
stage: test stage: test
<<: *dedicated-runner <<: *dedicated-runner
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +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 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],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment