Merged r21718 from trunk to 5.0-stable (#37452).

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

diff --git a/Gemfile b/Gemfile
index 29d639b9a7eb62ea8efb2f3b192adfbbb27c1e89..84c658ab3869f567b465501084bfad5d525de345 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '>= 2.5.0', '< 3.2.0'
 gem 'bundler', '>= 1.12.0'
 
-gem 'rails', '6.1.6'
+gem 'rails', '6.1.6.1'
 gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
 gem 'rouge', '~> 3.28.0'
 gem 'request_store', '~> 1.5.0'
@@ -22,6 +22,8 @@ gem 'rubyzip', '~> 2.3.0'
 gem 'net-smtp', '~> 0.3.0'
 gem 'net-imap', '~> 0.2.2'
 gem 'net-pop', '~> 0.1.1'
+# Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590
+gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0')
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]

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"