diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-05 08:55:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-05 08:55:16 +0000 |
| commit | f74387d2982845b0fb5219ccf3fd128d75400472 (patch) | |
| tree | 3cfbc60f1a62a1d308f1d1c98ad4a969721b873b /app/helpers/application_settings_helper.rb | |
| parent | e6a05e5a63b3b336179a4ed67df76ba7ad08fadb (diff) | |
| parent | 260225eb5753a18e9e33ec2bb9c1bfc76d613448 (diff) | |
| download | gitlab-ce-f74387d2982845b0fb5219ccf3fd128d75400472.tar.gz | |
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/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 3847a35fbab..acbcf0ded17 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -160,6 +160,8 @@ module ApplicationSettingsHelper :akismet_api_key, :akismet_enabled, :allow_local_requests_from_hooks_and_services, + :allow_local_requests_from_web_hooks_and_services, + :allow_local_requests_from_system_hooks, :dns_rebinding_protection_enabled, :archive_builds_in_human_readable, :authorized_keys_enabled, |