From 4266369e275fbb12b5c50b426aa7bdfc49e0339d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Lafoucrie=CC=80re?= Date: Wed, 26 Jun 2019 12:27:04 -0400 Subject: Add changelog entry --- .gitlab/ci/rails.gitlab-ci.yml | 4 ++-- changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 801bad46978..14bd803ada2 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -264,8 +264,8 @@ coverage: # Don't include dedicated-no-docs-no-db-pull-cache-job here since we need to # download artifacts from all the rspec jobs instead of from setup-test-env only extends: - .dedicated-runner-default-cache - .no-docs-and-no-qa + - .dedicated-runner-default-cache + - .no-docs-and-no-qa cache: policy: pull variables: diff --git a/changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml b/changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml new file mode 100644 index 00000000000..934453d91e0 --- /dev/null +++ b/changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml @@ -0,0 +1,5 @@ +--- +title: Avoid security checks on docs and clean-up GitLab-CI configuration +merge_request: 30081 +author: +type: fixed -- cgit v1.2.1