From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 9 Mar 2013 10:47:27 +0000 (+0000)
Subject: Merged r11488 from trunk.
X-Git-Tag: 2.3.0~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddf0307718e999abb2cf0531bfff6266e50beacd;p=redmine.git

Merged r11488 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11573 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 6ce41d415..8a30e19a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ end
 # Include database gems for the adapters found in the database
 # configuration file
 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)