summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-09-28 06:37:49 +0000
committerGo MAEDA <maeda@farend.jp>2022-09-28 06:37:49 +0000
commit0baa15fd15cdc1dcdf38a624a6cccbddba9b62c8 (patch)
tree78fded976be1da80e264632fb8b4ccc5a4ce7d08
parent468377d6b54e9a29a9f1949b7c90df7f84ccb80a (diff)
downloadredmine-0baa15fd15cdc1dcdf38a624a6cccbddba9b62c8.tar.gz
redmine-0baa15fd15cdc1dcdf38a624a6cccbddba9b62c8.zip
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
-rw-r--r--config/application.rb3
1 files changed, 2 insertions, 1 deletions
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"