diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-04 17:50:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-04 17:50:11 +0000 |
| commit | ecdf7c26826cec524a38b1d648090258e12b3d55 (patch) | |
| tree | 590cd25f48411b1edd41a1a94b2655fc2d2b3bd9 | |
| parent | 17dca783417ceeac62a462359a18290f18b2b4ab (diff) | |
| parent | 221dccab97766be810d87c6eb1d120145b41b364 (diff) | |
| download | gitlab-ce-ecdf7c26826cec524a38b1d648090258e12b3d55.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rwxr-xr-x | scripts/static-analysis | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f665f19132..44620d390ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -412,18 +412,6 @@ rake karma: paths: - 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 stage: test <<: *dedicated-runner diff --git a/scripts/static-analysis b/scripts/static-analysis index 1bd6b339830..7dc8f679036 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -3,6 +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 rake config_lint], %w[bundle exec rake flay], %w[bundle exec rake haml_lint], |