From 672941edde8c8a0ddea1a268bbc741ee16cf11df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Fri, 24 May 2019 08:33:22 +0000 Subject: [PATCH] Merge branch 'patch-64' into 'master' Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL Closes #62179 See merge request gitlab-org/gitlab-ce!28607 (cherry picked from commit 2ae642f8c7bf576b7113761ff00fa033373dc6ab) 31e181f8 Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL --- changelogs/unreleased/patch-64.yml | 5 +++++ lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml | 1 + 2 files changed, 6 insertions(+) create mode 100644 changelogs/unreleased/patch-64.yml diff --git a/changelogs/unreleased/patch-64.yml b/changelogs/unreleased/patch-64.yml new file mode 100644 index 00000000000..1bf022e7e41 --- /dev/null +++ b/changelogs/unreleased/patch-64.yml @@ -0,0 +1,5 @@ +--- +title: Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL +merge_request: 28607 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml index 706692e063b..abf16e5b2e7 100644 --- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml @@ -40,6 +40,7 @@ sast: SAST_BRAKEMAN_LEVEL \ SAST_GOSEC_LEVEL \ SAST_FLAWFINDER_LEVEL \ + SAST_GITLEAKS_ENTROPY_LEVEL \ SAST_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \ SAST_PULL_ANALYZER_IMAGE_TIMEOUT \ SAST_RUN_ANALYZER_TIMEOUT \ -- GitLab