diff options
author | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
commit | 3ef928029d94a2b3c6abf96a2935de85c4eed6c8 (patch) | |
tree | d8697b527a0a42e51634b1fef68f0162fe2ccbe2 /app/models/setting.rb | |
parent | 65263e6309fb4dea1a93d4b4806af629d317c156 (diff) | |
parent | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (diff) |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/models/setting.rb')
-rw-r--r-- | app/models/setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index a5878e96a..4bcaa060f 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -40,7 +40,7 @@ class Setting < RailsSettings::Base def all_as_records vars = thing_scoped - records = vars.each_with_object({}) { |r, h| h[r.var] = r } + records = vars.index_by(&:var) default_settings.each do |key, default_value| next if records.key?(key) || default_value.is_a?(Hash) |