From 452eb7f166754685866f54f832ca1ac5ffb955b5 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 9 Feb 2022 01:22:33 +0000
Subject: [PATCH] Merged r21059 from trunk to 4.1-stable (#35435).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21407 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index e72e7b9a1..bff94d45c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,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|
-- 
2.39.5