From c5fc9398d5bac0db434f03d411e6e73e4915c837 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 20 Jul 2022 02:43:42 +0000 Subject: [PATCH] Update Rails to 5.2.8.1 (#37465). git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21721 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 3 ++- config/application.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index e982bed29..f8f7a55cb 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.8' +gem 'rails', '5.2.8.1' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' @@ -25,6 +25,7 @@ gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' gem 'rubyzip', '~> 2.3.0' +gem 'psych', '~> 3.1' 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 1905b451c..dd18127f1 100644 --- 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 + ] # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. -- 2.39.5