Merge branch 'master' into 'master'

CI/CD coverage docs: fix pytest-cov regex

Closes #48613

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

app/views/projects/settings/ci_cd/_form.html.haml

@@ -91,7 +91,7 @@
                 %code \(\d+.\d+\%\) covered
               %li
                 pytest-cov (Python) -
-                %code \d+\%\s*$
+                %code ^TOTAL\s+\d+\s+\d+\s+(\d+\%)$
               %li
                 phpunit --coverage-text --colors=never (PHP) -
                 %code ^\s*Lines:\s*\d+.\d+\%