diff options
| author | Philippe Lafoucrière <plafoucriere@gitlab.com> | 2019-06-26 12:27:04 -0400 |
|---|---|---|
| committer | Philippe Lafoucrière <plafoucriere@gitlab.com> | 2019-06-27 15:14:58 -0400 |
| commit | 4266369e275fbb12b5c50b426aa7bdfc49e0339d (patch) | |
| tree | dc3c9155bdc80c74a5e24a30d5264f35fad1d2a7 | |
| parent | 61c400034f2210f5d45b1d3bb2c33748ed20fb10 (diff) | |
| download | gitlab-ce-no-security-scan-for-docs-branches.tar.gz | |
Add changelog entryno-security-scan-for-docs-branches
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/30081-cleanup-gitlab-ci-conf.yml | 5 |
2 files changed, 7 insertions, 2 deletions
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 |