summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 15:38:12 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 15:38:12 +0100
commita7f74e033f89b3111c6f297f9880bb2b22a1a15a (patch)
tree7a2af9e9a5d39e4fb9dac25398e3f30f702507ba /.gitlab-ci.yml
parente1e79e7e17f0ff7c6f1fa1c69c840a252af7596f (diff)
downloadgitlab-ce-a7f74e033f89b3111c6f297f9880bb2b22a1a15a.tar.gz
bundle:audit job only on master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd013d50faa..515eb856113 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"
@@ -162,7 +164,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