Merge branch 'master' into 'master'

Update the python example regex to work with --coverage

See merge request gitlab-org/gitlab-ce!31018

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+\%