diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-02-09 01:22:33 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-02-09 01:22:33 +0000 |
| commit | 452eb7f166754685866f54f832ca1ac5ffb955b5 (patch) | |
| tree | 22a6796b03a6b811928c1335305a02dc24b89a35 | |
| parent | 50e9988a60677f6a2cb6d424fb454e0551412a0c (diff) | |
| download | redmine-452eb7f166754685866f54f832ca1ac5ffb955b5.tar.gz redmine-452eb7f166754685866f54f832ca1ac5ffb955b5.zip | |
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
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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| |