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

diff --git a/config/application.rb b/config/application.rb
index dd18127f1dd9c9313d8faaac13a8a27361dfc285..3611c76b6c10b937fbca23db09bfcb7c381f48e7 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
     ]
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.