diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 15:58:05 +0300 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 15:58:05 +0300 |
commit | 7e55a227a53feaf4c8af9585a395f189402fcbc3 (patch) | |
tree | 732a42856686d58f5c54f9e32aa88539be38ee78 /app | |
parent | 61b606a803cf9c197eee3f1397562f94dd3df315 (diff) |
Revert "Merge branch 'use_gitlab_current_settings' into 'master'"
This reverts merge request !25370
Diffstat (limited to 'app')
-rw-r--r-- | app/validators/url_validator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb index c85f5ba5cdb..d3e32818dc7 100644 --- a/app/validators/url_validator.rb +++ b/app/validators/url_validator.rb @@ -93,6 +93,6 @@ class UrlValidator < ActiveModel::EachValidator end def allow_setting_local_requests? - Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services? + ApplicationSetting.current&.allow_local_requests_from_hooks_and_services? end end |