diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:08 +0000 |
| commit | 83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (patch) | |
| tree | 31f785012137fda4ac9a470f4f07c961b42d0299 /.gitlab | |
| parent | 57a37ce99f297cddae12cb4d982b6d572f932bb4 (diff) | |
| download | gitlab-ce-83731155d997ae24c7e0cd5ffa6f0dba41bec6dc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/pages.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |