diff options
author | Nick Schonning <nschonni@gmail.com> | 2023-02-20 00:58:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-20 06:58:28 +0100 |
commit | 717683d1c39d2fe85d1cc3f5223e1f4cf43f1900 (patch) | |
tree | adf7a7e93197707196ff3fdc7ca476deffede365 /app/models/setting.rb | |
parent | d2dcb6c45a9db5439772f0553046e2c03a739a16 (diff) |
Autofix Rubocop remaining Layout rules (#23679)
Diffstat (limited to 'app/models/setting.rb')
-rw-r--r-- | app/models/setting.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index c6558d692..3bdc6ffb4 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # == Schema Information # # Table name: settings @@ -30,6 +31,7 @@ class Setting < RailsSettings::Base default_value = default_settings[key] return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash) + db_val.value else default_settings[key] @@ -43,6 +45,7 @@ class Setting < RailsSettings::Base default_settings.each do |key, default_value| next if records.key?(key) || default_value.is_a?(Hash) + records[key] = Setting.new(var: key, value: default_value) end @@ -51,6 +54,7 @@ class Setting < RailsSettings::Base def default_settings return {} unless RailsSettings::Default.enabled? + RailsSettings::Default.instance end end |