diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 01:38:30 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 14:58:05 +0300 |
| commit | 4b55923402f75ce7651bc173f2c3b46b397b7c88 (patch) | |
| tree | 801abc5464ae592013fce6332ccf283f9dae28ec /app/views | |
| parent | 6b6317a5d1608a524a80116e33ec9bf90f5354a9 (diff) | |
Merge branch 'fj-15329-services-callbacks-ssrf-10-4' into 'security-10-4'
[10.4] Server Side Request Forgery in Services and Web Hooks
See merge request gitlab/gitlabhq!2347
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index ba4ca88a8a9..f9ed5d29041 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -841,5 +841,14 @@ .col-sm-10 = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control' + %fieldset + %legend Outbound requests + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :allow_local_requests_from_hooks_and_services do + = f.check_box :allow_local_requests_from_hooks_and_services + Allow requests to the local network from hooks and services + .form-actions = f.submit 'Save', class: 'btn btn-save' |