diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-18 14:37:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 14:37:57 +0100 |
| commit | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (patch) | |
| tree | c8f898f74d17137205f5324f8189c71f36bf913b /app/lib/settings/scoped_settings.rb | |
| parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) | |
| parent | e202314a75d3277c26f151764ff183d61dd2f9d0 (diff) | |
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/settings/scoped_settings.rb')
| -rw-r--r-- | app/lib/settings/scoped_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index 9889940f3..95e195458 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -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) |