diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
commit | 9c83aadd2604e7e6cb1f84683f951e6b12872618 (patch) | |
tree | c0a14c87378e832e87580be382e1c8ccea188b71 /doc/user/application_security | |
parent | 23bc19cb73aad969c9636b8b935111645e809e54 (diff) | |
download | gitlab-ce-9c83aadd2604e7e6cb1f84683f951e6b12872618.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/application_security')
-rw-r--r-- | doc/user/application_security/dast/index.md | 6 | ||||
-rw-r--r-- | doc/user/application_security/sast/index.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md index e12ee9e18f1..ff4ea13c392 100644 --- a/doc/user/application_security/dast/index.md +++ b/doc/user/application_security/dast/index.md @@ -217,7 +217,7 @@ It's also possible to add the `Gitlab-DAST-Permission` header via a proxy. The following config allows NGINX to act as a reverse proxy and add the `Gitlab-DAST-Permission` [header](http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header): -``` +```nginx # default.conf server { listen 80; @@ -237,7 +237,7 @@ to add the `Gitlab-DAST-Permission` [header](https://httpd.apache.org/docs/curre To do so, add the following lines to `httpd.conf`: -``` +```plaintext # httpd.conf LoadModule proxy_module modules/mod_proxy.so LoadModule proxy_connect_module modules/mod_proxy_connect.so @@ -472,7 +472,7 @@ Since it keeps most of its information in memory during a scan, it is possible for DAST to run out of memory while scanning large applications. This results in the following error: -``` +```plaintext [zap.out] java.lang.OutOfMemoryError: Java heap space ``` diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index a00ec6bedeb..5991fe8cf01 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -518,7 +518,7 @@ For SAST with all [supported languages and frameworks](#supported-languages-and- import the following default SAST analyzer images from `registry.gitlab.com` to your local "offline" registry: -``` +```plaintext registry.gitlab.com/gitlab-org/security-products/analyzers/bandit:2 registry.gitlab.com/gitlab-org/security-products/analyzers/brakeman:2 registry.gitlab.com/gitlab-org/security-products/analyzers/eslint:2 |