From: Go MAEDA <maeda@farend.jp>
Date: Wed, 28 Sep 2022 06:37:49 +0000 (+0000)
Subject: Merged r21863 from trunk to 5.0-stable (#37452, #37719).
X-Git-Tag: 5.0.3~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0baa15fd15cdc1dcdf38a624a6cccbddba9b62c8;p=redmine.git

Merged r21863 from trunk to 5.0-stable (#37452, #37719).


git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21864 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/config/application.rb b/config/application.rb
index 0a2d2f1fc..1b22feb12 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,7 +34,8 @@ module RedmineApp
     config.active_record.default_timezone = :local
     config.active_record.yaml_column_permitted_classes = [
       Symbol,
-      ActiveSupport::HashWithIndifferentAccess
+      ActiveSupport::HashWithIndifferentAccess,
+      ActionController::Parameters
     ]
 
     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"