diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
| commit | f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190 (patch) | |
| tree | 928e06a97ccd3c3eeef3b3c0ac03c8f59d516e59 /app/lib/settings | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 496a6b3dc5274cca08fe58c1d9a7cdc7d10d325b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Diffstat (limited to 'app/lib/settings')
| -rw-r--r-- | app/lib/settings/scoped_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index 70de7b792..343996e8a 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -32,7 +32,7 @@ module Settings def all_as_records vars = thing_scoped - records = vars.map { |r| [r.var, r] }.to_h + records = vars.each_with_object({}) { |r, h| h[r.var] = r } Setting.default_settings.each do |key, default_value| next if records.key?(key) || default_value.is_a?(Hash) @@ -66,7 +66,7 @@ module Settings class << self def default_settings - defaulting = DEFAULTING_TO_UNSCOPED.map { |k| [k, Setting[k]] }.to_h + defaulting = DEFAULTING_TO_UNSCOPED.each_with_object({}) { |k, h| h[k] = Setting[k] } Setting.default_settings.merge!(defaulting) end end |