summaryrefslogtreecommitdiff
path: root/doc/security
diff options
context:
space:
mode:
authorGeorge Koltsov <gkoltsov@gitlab.com>2019-07-26 14:03:06 +0100
committerGeorge Koltsov <gkoltsov@gitlab.com>2019-08-02 15:39:18 +0100
commitac7661924eebd6eb0fa72848e2b4bf4391ebf113 (patch)
treec38ea5f92cbd54f0c4d4d085ec68bd8347804d8e /doc/security
parent5a19a43a13031de83af2d241498465a882421270 (diff)
downloadgitlab-ce-ac7661924eebd6eb0fa72848e2b4bf4391ebf113.tar.gz
Update security/webhooks.md doc page & specs
Updating security/webhooks.md to match new behaviour as well as drying up few specs to extract shared examples
Diffstat (limited to 'doc/security')
-rw-r--r--doc/security/img/outbound_requests_section_v2.pngbin0 -> 21108 bytes
-rw-r--r--doc/security/webhooks.md8
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/security/img/outbound_requests_section_v2.png b/doc/security/img/outbound_requests_section_v2.png
new file mode 100644
index 00000000000..4fd3c7d9fce
--- /dev/null
+++ b/doc/security/img/outbound_requests_section_v2.png
Binary files differ
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 1194234a295..401df02e5c3 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -34,15 +34,15 @@ to 127.0.0.1, ::1 and 0.0.0.0, as well as IPv4 10.0.0.0/8, 172.16.0.0/12,
192.168.0.0/16 and IPv6 site-local (ffc0::/10) addresses won't be allowed.
This behavior can be overridden by enabling the option *"Allow requests to the
-local network from hooks and services"* in the *"Outbound requests"* section
+local network from web hooks and services"* in the *"Outbound requests"* section
inside the Admin area under **Settings**
(`/admin/application_settings/network`):
-![Outbound requests admin settings](img/outbound_requests_section.png)
+![Outbound requests admin settings](img/outbound_requests_section_v2.png)
>**Note:**
-*System hooks* are exempt from this protection because they are set up by
-admins.
+*System hooks* are enabled to make requests to local network by default since they are set up by admins.
+However, it can be turned off by disabling *"Allow requests to the local network from system hooks"* option.
<!-- ## Troubleshooting