diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-05 17:40:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-05 17:40:52 +0000 |
| commit | c61fe245295d8fbb98ead70cbc48ece2905bb4b6 (patch) | |
| tree | 348153aace84c8983077bf4836e27d7b8515fd1e | |
| parent | 7ff974e38e24a9b34f2b0e31093b4fe90e66f348 (diff) | |
| parent | aa97720a939dedb2197eedb93fcecf194d78ea96 (diff) | |
| download | gitlab-ce-c61fe245295d8fbb98ead70cbc48ece2905bb4b6.tar.gz | |
Merge branch 'upgrade-bundler-audit' into 'master'
Upgrade bundler-audit from 0.4.0 to 0.5.0
Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)).
See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28
See merge request !3433
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53f115c92c8..336ceb31021 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,8 +158,7 @@ bundler:audit: only: - master script: - - "bundle exec bundle-audit update" - - "bundle exec bundle-audit check --ignore OSVDB-115941" + - "bundle exec bundle-audit check --update --ignore OSVDB-115941" tags: - ruby - mysql diff --git a/Gemfile.lock b/Gemfile.lock index 229089f431d..0981c3195a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - bundler-audit (0.4.0) + bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) byebug (8.2.1) |