diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-13 22:38:30 +0000 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 11:58:05 +0000 |
| commit | 4b55923402f75ce7651bc173f2c3b46b397b7c88 (patch) | |
| tree | 801abc5464ae592013fce6332ccf283f9dae28ec /app/helpers | |
| parent | 6b6317a5d1608a524a80116e33ec9bf90f5354a9 (diff) | |
| download | gitlab-ce-4b55923402f75ce7651bc173f2c3b46b397b7c88.tar.gz | |
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/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 45f7d29eb05..44a0974bd30 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -244,7 +244,8 @@ module ApplicationSettingsHelper :usage_ping_enabled, :user_default_external, :user_oauth_applications, - :version_check_enabled + :version_check_enabled, + :allow_local_requests_from_hooks_and_services ] end end |