Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2021-01-18 13:57:12 +01:00
commit e202314a75
18 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/settings/scoped_settings.rb
View file

@ -31,7 +31,7 @@ module Settings
def all_as_records
vars = thing_scoped
records = vars.each_with_object({}) { |r, h| h[r.var] = r }
records = vars.index_by(&:var)
Setting.default_settings.each do |key, default_value|
next if records.key?(key) || default_value.is_a?(Hash)