Update Rails to 6.1.6.1 (#37452).

git-svn-id: https://svn.redmine.org/redmine/trunk@21718 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index a32b7ffbff85f80633614ef59d61a40e0c496ca3..a73c32d0b3dbad328408f1b5a920bd1684096150 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '>= 2.6.0', '< 3.2.0'
 gem 'bundler', '>= 1.12.0'
 
-gem 'rails', '6.1.6'
+gem 'rails', '6.1.6.1'
 gem 'rouge', '~> 3.29.0'
 gem 'request_store', '~> 1.5.0'
 gem 'mini_mime', '~> 1.1.0'

diff --git a/config/application.rb b/config/application.rb
index bba468f383ce1373914b1f18c6dfdfb47c565745..0a2d2f1fca4d9f2514c9d2cec0e200a485a9689a 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,6 +32,10 @@ module RedmineApp
 
     config.active_record.store_full_sti_class = true
     config.active_record.default_timezone = :local
+    config.active_record.yaml_column_permitted_classes = [
+      Symbol,
+      ActiveSupport::HashWithIndifferentAccess
+    ]
 
     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"