diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:50:39 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:50:39 +0000 |
| commit | 7196ee1095767c0adc7c41f92905b035609d0304 (patch) | |
| tree | dbc213e2f3ba9fccc93b7b32ccf4ab028939b5a0 | |
| parent | 90e91e28e40f2d5d5205e62f6e01e23af4da117f (diff) | |
| parent | a7f74e033f89b3111c6f297f9880bb2b22a1a15a (diff) | |
| download | gitlab-ce-7196ee1095767c0adc7c41f92905b035609d0304.tar.gz | |
Merge branch 'bundler-audit-only-master' into 'master'
bundle:audit job only on master
As discussed in !3215
See merge request !3227
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ba1d8d8468..b4dad768fa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,6 +148,8 @@ flay: bundler:audit: stage: test + only: + - master script: - "bundle exec bundle-audit update" - "bundle exec bundle-audit check --ignore OSVDB-115941" @@ -161,7 +163,7 @@ spec:feature:ruby22: stage: test image: ruby:2.2 only: - - master + - master script: - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature |