diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
| commit | f60c99a8fb0c99554fce091cac61d9ed07eef573 (patch) | |
| tree | 27457a4e091b820269daedb2f709ca304bcf5d06 /app/lib/settings/scoped_settings.rb | |
| parent | d7c1c41859549212a6d34ad869fded16acc17b48 (diff) | |
| parent | 88d69d3261c2f02278d07dc302ff7fc15bd68e8c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
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 95e195458..796de1113 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -64,7 +64,7 @@ module Settings class << self def default_settings - defaulting = DEFAULTING_TO_UNSCOPED.each_with_object({}) { |k, h| h[k] = Setting[k] } + defaulting = DEFAULTING_TO_UNSCOPED.index_with { |k| Setting[k] } Setting.default_settings.merge!(defaulting) end end |