From 7e55a227a53feaf4c8af9585a395f189402fcbc3 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Tue, 19 Feb 2019 12:58:05 +0000 Subject: Revert "Merge branch 'use_gitlab_current_settings' into 'master'" This reverts merge request !25370 --- app/validators/url_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/validators') 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 -- cgit v1.2.3