diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-08-25 13:54:52 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-08-25 13:54:52 +0000 |
| commit | 2d3076440853e38dba4f8de86335c004b45d025f (patch) | |
| tree | 73aad93cd5ea0116fb2a0df768476f4f28a44255 | |
| parent | 06712a91c0c52db7916b3dbbc7e15004c3efc972 (diff) | |
| download | redmine-2d3076440853e38dba4f8de86335c004b45d025f.tar.gz redmine-2d3076440853e38dba4f8de86335c004b45d025f.zip | |
Merged r21777 from trunk to 4.2-stable (#37476).
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21779 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index 45a12103e..f38e54f4c 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -105,7 +105,7 @@ class Setting < ActiveRecord::Base v = read_attribute(:value) # Unserialize serialized settings if available_settings[name]['serialized'] && v.is_a?(String) - v = YAML.safe_load(v, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess]) + v = YAML.safe_load(v, permitted_classes: Rails.configuration.active_record.yaml_column_permitted_classes) v = force_utf8_strings(v) end v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank? |