mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FEATURE: blank global settings should not shadow
Due to https://github.com/docker/docker/issues/9298 it is a huge pain to remove ENV vars when composing images, allow us to simply treat "blank" as a ENV var that is not being shadowed. In general we always supply a value to ENV vars we are shadowing.
This commit is contained in:
@@ -121,9 +121,11 @@ module SiteSettingExtension
|
||||
# exists it will be used instead of the setting and the setting will be hidden.
|
||||
# Useful for things like API keys on multisite.
|
||||
if opts[:shadowed_by_global] && GlobalSetting.respond_to?(name)
|
||||
hidden_settings << name
|
||||
shadowed_settings << name
|
||||
current_value = GlobalSetting.send(name)
|
||||
if (val = GlobalSetting.send(name)).present?
|
||||
hidden_settings << name
|
||||
shadowed_settings << name
|
||||
current_value = val
|
||||
end
|
||||
end
|
||||
|
||||
if opts[:refresh]
|
||||
|
Reference in New Issue
Block a user