diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-18 13:57:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-18 13:57:12 +0100 |
| commit | e202314a75d3277c26f151764ff183d61dd2f9d0 (patch) | |
| tree | c8f898f74d17137205f5324f8189c71f36bf913b /app/models/setting.rb | |
| parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) | |
| parent | e46b50e805e80d78c0efa39af3bd822912f2cdb9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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) |