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 0a2d2f1fca4d9f2514c9d2cec0e200a485a9689a..1b22feb12ec6baa12158f00a1a65a904eaeee395 100644 (file)
--- 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"