From 83731155d997ae24c7e0cd5ffa6f0dba41bec6dc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 6 Mar 2020 18:08:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/pages.gitlab-ci.yml | 2 +- .gitlab/ci/rails.gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab/ci') diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml index 993ed21e39d..7c6f25cfe6b 100644 --- a/.gitlab/ci/pages.gitlab-ci.yml +++ b/.gitlab/ci/pages.gitlab-ci.yml @@ -5,7 +5,7 @@ pages: - .default-cache - .pages:rules stage: pages - dependencies: ["coverage", "karma", "gitlab:assets:compile pull-cache"] + dependencies: ["rspec:coverage", "karma", "gitlab:assets:compile pull-cache"] script: - mv public/ .public/ - mkdir public/ diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 26f7febb59b..2f014824c91 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -202,7 +202,7 @@ gitlab:setup: paths: - log/development.log -coverage: +rspec:coverage: extends: - .rails-job-base - .rails:rules:ee-and-foss -- cgit v1.2.1