diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-01 08:57:07 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-01 08:57:07 +0000 |
| commit | 4fd8e9810978d80d649bcb79c92e35625486a1e0 (patch) | |
| tree | e140c11f44c95c6ef8474383e1478c59f6e1c271 | |
| parent | 682552615d450e56b67e5e51a6a7a74926b10709 (diff) | |
| parent | c91ef6cd6d1b2332b18c15017b2a8dc13cc1a391 (diff) | |
| download | gitlab-ce-4fd8e9810978d80d649bcb79c92e35625486a1e0.tar.gz | |
Merge branch 'master' into 'master'
Update the python example regex to work with --coverage
See merge request gitlab-org/gitlab-ce!31018
| -rw-r--r-- | app/views/projects/settings/ci_cd/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 2d108a1cba5..498a9744783 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -99,7 +99,7 @@ %code \(\d+.\d+\%\) covered %li pytest-cov (Python) - - %code ^TOTAL\s+\d+\s+\d+\s+(\d+\%)$ + %code ^TOTAL.+?(\d+\%)$ %li phpunit --coverage-text --colors=never (PHP) - %code ^\s*Lines:\s*\d+.\d+\% |