diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-03-24 06:17:24 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-03-24 06:17:24 +0000 |
| commit | 8f6608af65563916897ebdda3c274270c969d604 (patch) | |
| tree | bc402fab3907da5326acb5e6c15af9dc98cf2dc5 | |
| parent | f3fccaa35a9a024c82814a577f1b80571beda988 (diff) | |
| parent | 9d951e5fd5ac78d050f76ab4e4e0159646336b57 (diff) | |
| download | gitlab-ce-8f6608af65563916897ebdda3c274270c969d604.tar.gz | |
Merge branch 'frontend-coverage-badge' into 'master'
Include JavaScript test coverage in coverage badge
See merge request !10097
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | README.md | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24627b5faca..62468ad0f0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -281,6 +281,7 @@ rake karma: BABEL_ENV: "coverage" script: - bundle exec rake karma + coverage: '/^Statements *: (\d+\.\d+%)/' artifacts: name: coverage-javascript expire_in: 31d @@ -346,6 +347,7 @@ coverage: USE_BUNDLE_INSTALL: "true" script: - bundle exec scripts/merge-simplecov + coverage: '/LOC \((\d+\.\d+%)\) covered.$/' artifacts: name: coverage expire_in: 31d diff --git a/README.md b/README.md index 09e08adbb73..f0e3b52ef6f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@ # GitLab [](https://gitlab.com/gitlab-org/gitlab-ce/commits/master) -[](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby) +[](https://gitlab.com/gitlab-org/gitlab-ce/pipelines) [](https://codeclimate.com/github/gitlabhq/gitlabhq) [](https://bestpractices.coreinfrastructure.org/projects/42) +## Test coverage + +- [](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby) Ruby +- [](https://gitlab-org.gitlab.io/gitlab-ce/coverage-javascript) JavaScript + ## Canonical source The canonical source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/). |