Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Autofix Rubocop remaining Layout rules (#23679)

Browse source
This commit is contained in:
Nick Schonning 2023-02-20 00:58:28 -05:00 • committed by GitHub
parent d2dcb6c45a
commit 717683d1c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 265 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/setting.rb
View file

@ -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