From: Go MAEDA <maeda@farend.jp>
Date: Thu, 25 Aug 2022 13:54:52 +0000 (+0000)
Subject: Merged r21777 from trunk to 4.2-stable (#37476).
X-Git-Tag: 4.2.8~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d3076440853e38dba4f8de86335c004b45d025f;p=redmine.git

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

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?