diff options
| author | James Lopez <james@gitlab.com> | 2019-07-10 06:27:19 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-07-10 06:27:19 +0000 |
| commit | d4fb9a55ca6323ef51a3a3bad00bfba651e3f03c (patch) | |
| tree | 487c8542e895baadaa2b3ffb27eae8553c489f38 | |
| parent | 810df4fb51bf3db4016c5f7458599331d4586300 (diff) | |
| parent | bee24c85c0e070868d594783de075ba7e0feb812 (diff) | |
| download | gitlab-ce-d4fb9a55ca6323ef51a3a3bad00bfba651e3f03c.tar.gz | |
Merge branch 'caneldem-master-patch-77839' into 'master'
Propagate python version variable
See merge request gitlab-org/gitlab-ce!30519
| -rw-r--r-- | changelogs/unreleased/caneldem-master-patch-77839.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/caneldem-master-patch-77839.yml b/changelogs/unreleased/caneldem-master-patch-77839.yml new file mode 100644 index 00000000000..6239bcf67c4 --- /dev/null +++ b/changelogs/unreleased/caneldem-master-patch-77839.yml @@ -0,0 +1,5 @@ +--- +title: Propagate python version variable +merge_request: +author: Can Eldem +type: changed diff --git a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml index 8dd9775c583..f176771775e 100644 --- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml @@ -40,6 +40,7 @@ dependency_scanning: DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \ DS_PULL_ANALYZER_IMAGE_TIMEOUT \ DS_RUN_ANALYZER_TIMEOUT \ + DS_PYTHON_VERSION \ ) \ --volume "$PWD:/code" \ --volume /var/run/docker.sock:/var/run/docker.sock \ |