summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-11-05 06:42:00 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-11-05 06:42:00 +0000
commit97f9157de9e5b97a5e2e68a1a96b6677802ec76d (patch)
treee515529858a9ac6333d594b614d896c5a3766e67
parent95da91a66de5820a44989aa708338c24177cd10c (diff)
parent5f94e130d11adf4398058d1c558de6f44b11675a (diff)
downloadgitlab-ce-97f9157de9e5b97a5e2e68a1a96b6677802ec76d.tar.gz
Merge branch 'update-ci-settings' into 'master'
update example of regex for pytest-cov See merge request !1745
-rw-r--r--app/views/projects/ci_settings/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci_settings/_form.html.haml b/app/views/projects/ci_settings/_form.html.haml
index d711413c6b9..20bdccc9027 100644
--- a/app/views/projects/ci_settings/_form.html.haml
+++ b/app/views/projects/ci_settings/_form.html.haml
@@ -102,7 +102,7 @@
%code \(\d+.\d+\%\) covered
%li
pytest-cov (Python) -
- %code \d+\%$
+ %code \d+\%\s*$