summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-05-29 01:11:45 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-29 01:11:45 +0000
commit54dbaba577ad28645e71080698abee55fd2797ab (patch)
treea4eec25bbcb40aeac81e2412495c41fe1c1d6861 /docker
parent9daae83fdd14d2cfb5b4b9651cae178884892ac7 (diff)
parentb41b9e6005df7d32a586bf92d858291480beb83a (diff)
downloadgitlab-ce-54dbaba577ad28645e71080698abee55fd2797ab.tar.gz
Merge branch '11105-fix-cs-with-proxy' into 'master'
Disable proxy in container scanning template Closes gitlab-ee#11105 See merge request gitlab-org/gitlab-ce!27246
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions