summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-07-19 14:16:49 +0000
committerGo MAEDA <maeda@farend.jp>2022-07-19 14:16:49 +0000
commit60acaa72866013f7d1c5d094845b66bf4aaefea3 (patch)
tree86e70dd118b225acb65d14c36e9266d6ef6ef8d1
parentf8a073b713c05a919a6a525bee04b2a3c1d30680 (diff)
downloadredmine-60acaa72866013f7d1c5d094845b66bf4aaefea3.tar.gz
redmine-60acaa72866013f7d1c5d094845b66bf4aaefea3.zip
Update Rails to 6.1.6.1 (#37452).
git-svn-id: https://svn.redmine.org/redmine/trunk@21718 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
-rw-r--r--config/application.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index a32b7ffbf..a73c32d0b 100644
--- 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 bba468f38..0a2d2f1fc 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
+ ]
config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"