Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-05 09:08:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-05 09:08:22 +0300
commit17dffb6c5192c03eb6257dd062d8e8ab2a022c30 (patch)
tree30c60f15d548392e8a0773b64bec8ca39eaf6c28 /.gitlab
parent082a47557774c89745c66e08c0a4171a53e7bdb2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml4
2 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 6e84d4f3914..4b1194d0fbd 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -280,7 +280,9 @@ coverage-frontend:
paths:
- coverage-frontend/
reports:
- cobertura: coverage-frontend/cobertura-coverage.xml
+ coverage_report:
+ coverage_format: cobertura
+ path: coverage-frontend/cobertura-coverage.xml
.qa-frontend-node:
extends:
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index cbedd83ac95..b4793f91d36 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -610,7 +610,9 @@ rspec:coverage:
- coverage/assets/
- coverage/lcov/
reports:
- cobertura: coverage/coverage.xml
+ coverage_report:
+ coverage_format: cobertura
+ path: coverage/coverage.xml
rspec:undercoverage:
extends: