summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings/_outbound.html.haml
diff options
context:
space:
mode:
authorMartin Hanzel <mhanzel@gitlab.com>2019-07-25 12:59:37 +0200
committerMartin Hanzel <mhanzel@gitlab.com>2019-07-25 12:59:37 +0200
commit8201593066c5b932d7f998da5c07ea91e25a15cc (patch)
tree0204ab6ff6f506ff43c95855605dc056d68d8b2a /app/views/admin/application_settings/_outbound.html.haml
parent979f0842653fa6b48a88cb6286a2145654d8e197 (diff)
parent0ec40a68b73cbf14b34e55ee2a54df1f47c19cfb (diff)
downloadgitlab-ce-8201593066c5b932d7f998da5c07ea91e25a15cc.tar.gz
Merge commit '0ec40a68b73cbf14b34e55ee2a54df1f47c19cfb' into mh/editor-indentsmh/editor-indents-reviewmh/editor-indents
Diffstat (limited to 'app/views/admin/application_settings/_outbound.html.haml')
-rw-r--r--app/views/admin/application_settings/_outbound.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml
index d16304ed338..e58bb526c11 100644
--- a/app/views/admin/application_settings/_outbound.html.haml
+++ b/app/views/admin/application_settings/_outbound.html.haml
@@ -9,6 +9,13 @@
Allow requests to the local network from hooks and services
.form-group
+ = f.label :outbound_local_requests_whitelist_raw, class: 'label-bold' do
+ = _('Whitelist to allow requests to the local network from hooks and services')
+ = f.text_area :outbound_local_requests_whitelist_raw, placeholder: "example.com, 192.168.1.1", class: 'form-control', rows: 8
+ %span.form-text.text-muted
+ = _('Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are disabled. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 4000 entries. Domains should use IDNA encoding. Ex: domain.com, 192.168.1.1, 127.0.0.0/28.')
+
+ .form-group
.form-check
= f.check_box :dns_rebinding_protection_enabled, class: 'form-check-input'
= f.label :dns_rebinding_protection_enabled, class: 'form-check-label' do