diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-25 00:31:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 00:31:15 +0100 |
| commit | a2a85d5ae03282c6f9cbf452b9b8f7d948a9f380 (patch) | |
| tree | f3f15ea30de78e0fabaa5135a3b3c7b51053e4b6 /app/lib/settings/scoped_settings.rb | |
| parent | d7c1c41859549212a6d34ad869fded16acc17b48 (diff) | |
| parent | 5ea53b6158c42660aa61da2a49a3bbf9e2e406d0 (diff) | |
Merge pull request #1516 from ClearlyClaire/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 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 |