summaryrefslogtreecommitdiff
path: root/app/models/application_setting_implementation.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/application_setting_implementation.rb')
-rw-r--r--app/models/application_setting_implementation.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index b05355f14b4..4fca087cf20 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -269,13 +269,13 @@ module ApplicationSettingImplementation
self.protected_paths = strings_to_array(values)
end
- def asset_proxy_whitelist=(values)
+ def asset_proxy_allowlist=(values)
values = strings_to_array(values) if values.is_a?(String)
- # make sure we always whitelist the running host
+ # make sure we always allow the running host
values << Gitlab.config.gitlab.host unless values.include?(Gitlab.config.gitlab.host)
- self[:asset_proxy_whitelist] = values
+ self[:asset_proxy_allowlist] = values
end
def repository_storages