Merged r21923 from trunk to 4.2-stable (#37814).

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

diff --git a/config/application.rb b/config/application.rb
index 3611c76b6c10b937fbca23db09bfcb7c381f48e7..d6e2189e05701155b9e7ae56796d272a1771ac4e 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,6 +33,8 @@ module RedmineApp
     config.active_record.store_full_sti_class = true
     config.active_record.default_timezone = :local
     config.active_record.yaml_column_permitted_classes = [
+      Date,
+      Time,
       Symbol,
       ActiveSupport::HashWithIndifferentAccess,
       ActionController::Parameters