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

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

diff --git a/config/application.rb b/config/application.rb
index 1b22feb12ec6baa12158f00a1a65a904eaeee395..5e93df122d58199e9910d415b7603565c2aecd66 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