Commit 7196ee10 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'bundler-audit-only-master' into 'master'

bundle:audit job only on master

As discussed in !3215

See merge request !3227
parents 90e91e28 a7f74e03
...@@ -148,6 +148,8 @@ flay: ...@@ -148,6 +148,8 @@ flay:
bundler:audit: bundler:audit:
stage: test stage: test
only:
- master
script: script:
- "bundle exec bundle-audit update" - "bundle exec bundle-audit update"
- "bundle exec bundle-audit check --ignore OSVDB-115941" - "bundle exec bundle-audit check --ignore OSVDB-115941"
...@@ -161,7 +163,7 @@ spec:feature:ruby22: ...@@ -161,7 +163,7 @@ spec:feature:ruby22:
stage: test stage: test
image: ruby:2.2 image: ruby:2.2
only: only:
- master - master
script: script:
- RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
......
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