From: Go MAEDA <maeda@farend.jp>
Date: Sat, 3 Jul 2021 23:13:32 +0000 (+0000)
Subject: Psych 4: aliases in database.yml cause Psych::BadAlias exception (#35435).
X-Git-Tag: 5.0.0~352
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aa20cd9ec210df7de884482be3e4d93936cd31ab;p=redmine.git

Psych 4: aliases in database.yml cause Psych::BadAlias exception (#35435).

Patch by Pavel Rosický.


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

diff --git a/Gemfile b/Gemfile
index 7093980b8..984cc078a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,8 @@ require 'erb'
 require 'yaml'
 database_file = File.join(File.dirname(__FILE__), "config/database.yml")
 if File.exist?(database_file)
-  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+  yaml_config = ERB.new(IO.read(database_file)).result
+  database_config = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml_config) : YAML.load(yaml_config)
   adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
   if adapters.any?
     adapters.each do |adapter|