summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-09-30 07:01:56 +0000
committerGo MAEDA <maeda@farend.jp>2022-09-30 07:01:56 +0000
commit8c66e90bbb27aab9f19cd9556f7a7059a9933eca (patch)
tree69795ef9d450786577745a06fd8beb0039496207
parent80f1374fc913d152d5c872d50af979d881d40552 (diff)
downloadredmine-8c66e90bbb27aab9f19cd9556f7a7059a9933eca.tar.gz
redmine-8c66e90bbb27aab9f19cd9556f7a7059a9933eca.zip
Merged r21863 from trunk to 4.2-stable (#37465, #37719).
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21871 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 dd18127f1..3611c76b6 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
]
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.