summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-02-14 19:40:40 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-02-14 19:40:40 +0000
commit9760fd7a95cb1dcdcee227817e41c924f5d39dc7 (patch)
tree80ffb9d8cc358680f4f6c486ad583c9e288cb270 /.gitlab-ci.yml
parentad5e772bddd7b417fa7a36629db02c69b1b9864d (diff)
parentbfb82f8a0d4d837a0472342c05de18c60037a2ea (diff)
downloadgitlab-ce-9760fd7a95cb1dcdcee227817e41c924f5d39dc7.tar.gz
Merge branch 'cover-my-karma' into 'master'
Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !9133
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d0c976d816..b8619d7d3f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -254,7 +254,7 @@ karma:
name: coverage-javascript
expire_in: 31d
paths:
- - coverage-javascript/default/
+ - coverage-javascript/
lint-doc:
stage: test
@@ -393,7 +393,7 @@ pages:
- mv public/ .public/
- mkdir public/
- mv coverage/ public/coverage-ruby/ || true
- - mv coverage-javascript/default/ public/coverage-javascript/ || true
+ - mv coverage-javascript/ public/coverage-javascript/ || true
- mv eslint-report.html public/ || true
artifacts:
paths: