summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-06-05 07:42:31 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-06-05 07:42:31 +0000
commit1498de225cb0a4c4ac8a3954bde2c9597518c36c (patch)
tree4d8d83ba25e6bf38d1aae4b065892dd3f3694c71
parentbedc66eb0407aa36127367f53f76944ebb98f5a6 (diff)
parent64b6dbea74bea6982c85680aa8a5d4d1a6f312f6 (diff)
downloadgitlab-ce-1498de225cb0a4c4ac8a3954bde2c9597518c36c.tar.gz
Merge branch 'ci_script_simplify1' into 'master'
CI script: remove directives with default value See merge request !1841
-rw-r--r--.gitlab-ci.yml10
1 files changed, 0 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 021acdeca39..1411a9194b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,32 +18,22 @@ jobs:
- script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
name: Rspec
- branches: true
- tags: false
runner: ruby,mysql
- script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
name: Spinach
- branches: true
- tags: false
runner: ruby,mysql
- script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
name: Jasmine
- branches: true
- tags: false
runner: ruby,mysql
- script:
- bundle exec rubocop
name: Rubocop
- branches: true
- tags: false
runner: ruby,mysql
- script:
- bundle exec rake brakeman
name: Brakeman
- branches: true
- tags: false
runner: ruby,mysql
deploy_jobs: []
skip_refs: ''