diff options
author | Robert Speicher <robert@gitlab.com> | 2017-02-22 22:36:39 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-02-22 22:36:39 +0000 |
commit | d9d12c74f3d8d9322d5116f920bc00a92b73fad4 (patch) | |
tree | 08a4cbd71ff38360601859282358b38d6480227f | |
parent | e7a64ec384b34c94d75ce54db852c2fcb9c7c4d3 (diff) | |
parent | a942240ef5c5bef7e0d1fcf5294209a3a6b69bdf (diff) | |
download | gitlab-ce-d9d12c74f3d8d9322d5116f920bc00a92b73fad4.tar.gz |
Merge branch 'ignore-rails-cves' into 'master'
Ignore two Rails CVEs in bundler:audit job
See merge request !9456
-rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 433b3119fba..20f410d0b4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -281,7 +281,7 @@ bundler:audit: - master@gitlab/gitlabhq - master@gitlab/gitlab-ee script: - - "bundle exec bundle-audit check --update --ignore OSVDB-115941" + - "bundle exec bundle-audit check --update --ignore OSVDB-115941 CVE-2016-6316 CVE-2016-6317" migration paths: stage: test |