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

2021-01-18 13:57:12 +01:00
parent a7a47834e5 e46b50e805
commit e202314a75
18 changed files with 48 additions and 43 deletions
--- 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)