diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-19 14:16:25 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-19 14:16:25 +0300 |
| commit | 6025b4e8a3845cdf1ac60d7c1e2831b7ce1140bd (patch) | |
| tree | 732839854ee69ad011bfd413c6a79dad9a755262 /app | |
| parent | 1b5e3b2e91ed2d9fea3b92d824faad9f1df90e87 (diff) | |
| parent | 8a1b6041c8af7007c80de87221e20512810be26d (diff) | |
Merge branch 'use_gitlab_current_settings' into 'master'
Use Gitlab::CurrentSettings in UrlValidator
See merge request gitlab-org/gitlab-ce!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 d3e32818dc7..c85f5ba5cdb 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? - ApplicationSetting.current&.allow_local_requests_from_hooks_and_services? + Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services? end end |