diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
| commit | 639bca436297e65f16499c5b76a9e5ffb2b798c8 (patch) | |
| tree | 832636f41824529da2796dedc7888effd42940c9 /.gitlab-ci.yml | |
| parent | bdcb81be95b3287e14cf23b2f1d0849b24077360 (diff) | |
| parent | 4b43126d08972c201551fbd1fe42e85847d5e03f (diff) | |
| download | gitlab-ce-639bca436297e65f16499c5b76a9e5ffb2b798c8.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8d2499f984..a038af69665 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -235,7 +235,13 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21 script: - bundle exec $CI_BUILD_NAME -rubocop: *exec +rubocop: + <<: *ruby-static-analysis + <<: *dedicated-runner + stage: test + script: + - bundle exec "rubocop --require rubocop-rspec" + rake haml_lint: *exec rake scss_lint: *exec rake brakeman: *exec |