diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 01:38:25 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-16 18:15:05 +0300 |
| commit | 2d6c50bf02f975f1d28d35580c4ab10276787093 (patch) | |
| tree | d37d985e7684ddeee04ab545eb77d0f3132e2592 /app/views | |
| parent | 9a7fd873f81d1f1755a3cb4bcaa54b7fb49b6b8d (diff) | |
Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'
Server Side Request Forgery in Services and Web Hooks
See merge request gitlab/gitlabhq!2337
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 81d7db04a3c..54b39df8cf3 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -860,5 +860,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' |