diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-05 11:55:16 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-05 11:55:16 +0300 |
| commit | f74387d2982845b0fb5219ccf3fd128d75400472 (patch) | |
| tree | 3cfbc60f1a62a1d308f1d1c98ad4a969721b873b /app/views | |
| parent | e6a05e5a63b3b336179a4ed67df76ba7ad08fadb (diff) | |
| parent | 260225eb5753a18e9e33ec2bb9c1bfc76d613448 (diff) | |
Merge branch 'georgekoltsov/55474-outbound-setting-system-hooks' into 'master'
Add outbound setting for system hooks
See merge request gitlab-org/gitlab-ce!31177
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_outbound.html.haml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index 4fecdb59e1d..ad26f52aea7 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -4,9 +4,13 @@ %fieldset .form-group .form-check - = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input' - = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do - Allow requests to the local network from hooks and services + = f.check_box :allow_local_requests_from_web_hooks_and_services, class: 'form-check-input' + = f.label :allow_local_requests_from_web_hooks_and_services, class: 'form-check-label' do + = _('Allow requests to the local network from web hooks and services') + .form-check + = f.check_box :allow_local_requests_from_system_hooks, class: 'form-check-input' + = f.label :allow_local_requests_from_system_hooks, class: 'form-check-label' do + = _('Allow requests to the local network from system hooks') .form-group = f.label :outbound_local_requests_whitelist_raw, class: 'label-bold' do |