summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-05-24 08:33:22 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-05-24 08:33:22 +0000
commit2ae642f8c7bf576b7113761ff00fa033373dc6ab (patch)
tree614a48cc6e3eba90ed6ea49a74f049a6641eab16
parentbbe979f89c7f5f6c53b9c717b3459cff8aca27b5 (diff)
parentaf549bf12cb09b60bf74df834ca82fad7612a67c (diff)
downloadgitlab-ce-2ae642f8c7bf576b7113761ff00fa033373dc6ab.tar.gz
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
-rw-r--r--changelogs/unreleased/patch-64.yml5
-rw-r--r--lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml1
2 files changed, 6 insertions, 0 deletions
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 \